From ef3b09bfaf904aad3de787aed0a843885e7875e4 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 24 Apr 2024 08:55:46 -0700 Subject: [PATCH] chore(ci): bump protoc version (#8025) ### 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 --- .github/actions/setup-rust/action.yml | 8 ++++---- .github/workflows/bench-turborepo.yml | 2 +- .github/workflows/test.yml | 8 ++++---- .github/workflows/turborepo-library-release.yml | 4 ++-- .github/workflows/turborepo-native-lib-test.yml | 2 +- .github/workflows/turborepo-release.yml | 9 +++++---- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index 7c6039ae6b3eb..21d3ca52b1063 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -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" diff --git a/.github/workflows/bench-turborepo.yml b/.github/workflows/bench-turborepo.yml index 14a9a80bc02e4..5fa0f55528d45 100644 --- a/.github/workflows/bench-turborepo.yml +++ b/.github/workflows/bench-turborepo.yml @@ -56,7 +56,7 @@ jobs: - name: ubuntu runner: ubuntu-latest - name: macos - runner: macos-12 + runner: macos-latest - name: windows runner: windows-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e21ecae912661..0d1c993978707 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -207,7 +207,7 @@ jobs: - "x64" - "metal" - name: macos - runner: macos-12 + runner: macos-latest - name: windows runner: windows-latest steps: @@ -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 @@ -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 }} @@ -652,7 +652,7 @@ jobs: - "metal" nextest: linux - name: macos - runner: macos-12 + runner: macos-latest nextest: mac - name: windows runner: windows-latest diff --git a/.github/workflows/turborepo-library-release.yml b/.github/workflows/turborepo-library-release.yml index ce64ae61f4afd..cd8663fa47b44 100644 --- a/.github/workflows/turborepo-library-release.yml +++ b/.github/workflows/turborepo-library-release.yml @@ -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 diff --git a/.github/workflows/turborepo-native-lib-test.yml b/.github/workflows/turborepo-native-lib-test.yml index 95a323e7cacfd..453db792e6fee 100644 --- a/.github/workflows/turborepo-native-lib-test.yml +++ b/.github/workflows/turborepo-native-lib-test.yml @@ -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 }} diff --git a/.github/workflows/turborepo-release.yml b/.github/workflows/turborepo-release.yml index bfbcab003be0d..1f7e39ae7b2a9 100644 --- a/.github/workflows/turborepo-release.yml +++ b/.github/workflows/turborepo-release.yml @@ -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 @@ -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