From 55d40f38db910d547e92d64c05df3381f4f37235 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Thu, 25 Apr 2024 19:35:53 +0100 Subject: [PATCH] chore(ci): revert to macos-12 runners macos-latest has switched to arm64 update arduino/setup-protoc@v3 to support arm64 --- .github/workflows/examples.yml | 12 ++++++------ .github/workflows/gradle.yml | 6 +++--- .github/workflows/plugin-cli.yml | 4 ++-- .github/workflows/release.yml | 7 ++----- .github/workflows/rust.yml | 6 +++--- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 5e1ee6f7..8a195cf7 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ ubuntu-latest, windows-latest, macos-latest ] + operating-system: [ ubuntu-latest, windows-latest, macos-12 ] env: PACT_DO_NOT_TRACK: true RUST_LOG: trace @@ -24,7 +24,7 @@ jobs: with: toolchain: stable - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install plugin cli @@ -84,7 +84,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ ubuntu-latest, windows-latest, macos-latest ] + operating-system: [ ubuntu-latest, windows-latest, macos-12 ] env: PACT_DO_NOT_TRACK: true RUST_LOG: trace @@ -99,7 +99,7 @@ jobs: with: toolchain: stable - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Go @@ -173,7 +173,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ ubuntu-latest, windows-latest, macos-latest ] + operating-system: [ ubuntu-latest, windows-latest, macos-12 ] env: PACT_DO_NOT_TRACK: true RUST_LOG: trace @@ -188,7 +188,7 @@ jobs: with: toolchain: stable - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Go diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5d30dfc9..079ec7e5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ ubuntu-latest, windows-latest, macos-latest ] + operating-system: [ ubuntu-latest, windows-latest, macos-12 ] steps: - uses: actions/checkout@v4 - name: Set up JDK 19 @@ -18,7 +18,7 @@ jobs: distribution: 'temurin' java-version: 19 - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Build plugin driver @@ -51,7 +51,7 @@ jobs: distribution: 'temurin' java-version: ${{ matrix.jdk }} - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Build plugin driver diff --git a/.github/workflows/plugin-cli.yml b/.github/workflows/plugin-cli.yml index 22d231e4..f5f0eaf7 100644 --- a/.github/workflows/plugin-cli.yml +++ b/.github/workflows/plugin-cli.yml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ ubuntu-latest, windows-latest, macos-latest ] + operating-system: [ ubuntu-latest, windows-latest, macos-12 ] steps: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 @@ -15,7 +15,7 @@ jobs: toolchain: stable components: clippy - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Build plugin CLI diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3395e92..5a64b3c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,10 +7,7 @@ on: pull_request: branches: - main - push: - branches: - - feat/musl_built_binaries - + concurrency: group: release-${{ github.ref }} cancel-in-progress: true @@ -55,7 +52,7 @@ jobs: run: choco install -y llvm if: runner.os == 'Windows' - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Cargo flags diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4420b3fc..228260d1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ ubuntu-latest, windows-latest, macos-latest ] + operating-system: [ ubuntu-latest, windows-latest, macos-12 ] env: pact_do_not_track: true steps: @@ -17,7 +17,7 @@ jobs: toolchain: stable components: clippy - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install plugin cli @@ -63,7 +63,7 @@ jobs: curl -LO https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.88.77/pact-1.88.77-linux-x86_64.tar.gz tar xzf pact-1.88.77-linux-x86_64.tar.gz VER=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version') - pact/bin/pact-broker publish -a "$VER+$GITHUB_SHA" -b https://saf.pactflow.io -k ${{ secrets.PACTFLOW_TOKEN }} target/pacts + pact/bin/pact-broker publish -a "$VER+$GITHUB_SHA" -b https://pact-foundation.pactflow.io -k ${{ secrets.PACTFLOW_TOKEN }} target/pacts working-directory: drivers/rust/driver_pact_tests if: runner.os == 'Linux'