Skip to content

Commit

Permalink
chore(ci): bump protoc version (#8025)
Browse files Browse the repository at this point in the history
### Description

Bumping `setup-protoc` to version 2 as it supports fetching MacOS
`arm64` builds which are required for `macos-latest` now that it runs on
an M1 chip.
Bumping `protoc` from `3.20` to `3.26` as `3.20` didn't have builds
available for MacOS arm64.

Note: Starting with 3.21 the protobuf project has switched it's
versioning scheme so the major version 3 is implied. `setup-protoc`
matches this as of 2.0.0 so we specify version with the format of
`MINOR.PATCH`.
We cannot update to `setup-protoc` to 3.0 as it uses Node20 which
requires too high of glibc version for us to support our x86 musl
builds.

### Testing Instructions

CI Passes

Verify that library release is able to build on arm64 machines:
https://github.com/vercel/turbo/actions/runs/8806177110/job/24170410394

Dry run of release process:
https://github.com/vercel/turbo/actions/runs/8807124431


Closes TURBO-2863
  • Loading branch information
chris-olszewski committed Apr 24, 2024
1 parent ab004db commit ef3b09b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ runs:
- name: Set Up Protoc
id: set-up-protoc
continue-on-error: true
uses: arduino/setup-protoc@v1.2.0
uses: arduino/setup-protoc@v2.1.0
with:
version: "3.x"
version: "26.x"
repo-token: ${{ inputs.github-token }}

- name: Set Up Protoc (second try)
if: steps.set-up-protoc.outcome == 'failure'
uses: arduino/setup-protoc@v1.2.0
uses: arduino/setup-protoc@v2.1.0
with:
version: "3.x"
version: "26.x"
repo-token: ${{ inputs.github-token }}

- name: "Add cargo problem matchers"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench-turborepo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: ubuntu
runner: ubuntu-latest
- name: macos
runner: macos-12
runner: macos-latest
- name: windows
runner: windows-latest

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ jobs:
- "x64"
- "metal"
- name: macos
runner: macos-12
runner: macos-latest
- name: windows
runner: windows-latest
steps:
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
matrix:
os:
- runner: ubuntu-latest
- runner: macos-12
- runner: macos-latest
- runner: windows-latest
steps:
# On Windows, set autocrlf to input so that when the repo is cloned down
Expand Down Expand Up @@ -357,7 +357,7 @@ jobs:
- "x64"
- "metal"
- name: macos
runner: macos-12
runner: macos-latest
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
Expand Down Expand Up @@ -652,7 +652,7 @@ jobs:
- "metal"
nextest: linux
- name: macos
runner: macos-12
runner: macos-latest
nextest: mac
- name: windows
runner: windows-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/turborepo-library-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
fail-fast: false
matrix:
settings:
- host: macos-12
- host: macos-latest
target: "aarch64-apple-darwin"
- host: macos-12
- host: macos-latest
target: "x86_64-apple-darwin"

- host: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/turborepo-native-lib-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- "x64"
- "metal"
- name: macos
runner: macos-12
runner: macos-latest
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/turborepo-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,16 @@ jobs:
fail-fast: false
matrix:
settings:
- host: macos-12
- host: macos-latest
target: "x86_64-apple-darwin"
container-options: "--rm"
- host: macos-12
- host: macos-latest
target: "aarch64-apple-darwin"
container-options: "--rm"
- host: ubuntu-latest
container: ubuntu:xenial
container-options: "--platform=linux/amd64 --rm"
container-setup: "apt-get update && apt-get install -y curl musl-tools sudo"
container-setup: "apt-get update && apt-get install -y curl musl-tools sudo unzip"
target: "x86_64-unknown-linux-musl"
setup: "apt-get install -y build-essential clang-5.0 lldb-5.0 llvm-5.0-dev libclang-5.0-dev"
- host: ubuntu-latest
Expand Down Expand Up @@ -144,8 +144,9 @@ jobs:
run: ${{ matrix.settings.container-setup }}

- name: Setup Protoc
uses: arduino/setup-protoc@v1.2.0
uses: arduino/setup-protoc@v2.1.0
with:
version: "26.x"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup capnproto
Expand Down

0 comments on commit ef3b09b

Please sign in to comment.