Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use protoc x86_64 on Apple M1 aarch64 #6005

Merged
merged 2 commits into from Apr 27, 2022
Merged

Use protoc x86_64 on Apple M1 aarch64 #6005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e33e100
Use protoc x86_64 on Apple M1 aarch64
schlosna Apr 21, 2022
81daf37
Add generated changelog entries
svc-changelog Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion atlasdb-client-protobufs/build.gradle
View file
Open in desktop
Expand Up @@ -2,9 +2,12 @@ apply from: "../gradle/shared.gradle"

apply plugin: 'com.google.protobuf'

// The protoc version atlasdb uses does not yet support Apple M1 aarch64
// (see https://github.com/protocolbuffers/protobuf/issues/8062), so use x86_64.
def protocArch = 'osx-aarch_64'.equals(osdetector.classifier) ? 'osx-x86_64' : osdetector.classifier
protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${libVersions.protoc}"
artifact = "com.google.protobuf:protoc:${libVersions.protoc}:${protocArch}"
}
}

Expand Down
10 changes: 10 additions & 0 deletions changelog/@unreleased/pr-6005.v2.yml
View file
Open in desktop
@@ -0,0 +1,10 @@
type: fix
fix:
description: |-
Use protoc x86_64 on Apple M1 aarch64

The old protoc version 3.5.1 atlasdb uses does not yet support Apple M1 aarch64
(see https://github.com/protocolbuffers/protobuf/issues/8062), so use x86_64 until
atlasdb upgrades to protoc 3.18.0+ which add osx-aarch_64.
links:
- https://github.com/palantir/atlasdb/pull/6005
5 changes: 4 additions & 1 deletion examples/profile-client-protobufs/build.gradle
View file
Open in desktop
Expand Up @@ -4,9 +4,12 @@ group = 'com.palantir.atlasdb.examples'

apply plugin: 'com.google.protobuf'

// The protoc version atlasdb uses does not yet support Apple M1 aarch64
// (see https://github.com/protocolbuffers/protobuf/issues/8062), so use x86_64.
def protocArch = 'osx-aarch_64'.equals(osdetector.classifier) ? 'osx-x86_64' : osdetector.classifier
protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${libVersions.protoc}"
artifact = "com.google.protobuf:protoc:${libVersions.protoc}:${protocArch}"
}
}

Expand Down
5 changes: 4 additions & 1 deletion leader-election-api-protobufs/build.gradle
View file
Open in desktop
Expand Up @@ -2,9 +2,12 @@ apply from: "../gradle/shared.gradle"

apply plugin: 'com.google.protobuf'

// The protoc version atlasdb uses does not yet support Apple M1 aarch64
// (see https://github.com/protocolbuffers/protobuf/issues/8062), so use x86_64.
def protocArch = 'osx-aarch_64'.equals(osdetector.classifier) ? 'osx-x86_64' : osdetector.classifier
protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${libVersions.protoc}"
artifact = "com.google.protobuf:protoc:${libVersions.protoc}:${protocArch}"
}
}

Expand Down