From c93b10534d7bee13cf63d8769cd7c7d7773d701e Mon Sep 17 00:00:00 2001 From: Ross Savage <551697+dangeross@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:22:41 +0200 Subject: [PATCH] Install protoc on workflow (#352) * install protoc on workflow (cherry picked from commit 317c7906d968eeb6726ab4a9076a8bf64bdf4a6e) * Bump setup-protoc to v3 and 27.2 --------- Co-authored-by: Roei Erez --- .github/workflows/build-bindings-android.yml | 6 ++++++ .github/workflows/build-bindings-darwin.yml | 6 ++++++ .github/workflows/build-bindings-ios.yml | 6 ++++++ .github/workflows/build-bindings-linux.yml | 6 ++++++ .github/workflows/build-bindings-windows.yml | 6 ++++++ .github/workflows/build-language-bindings.yml | 6 ++++++ .github/workflows/main.yml | 16 ++++++++-------- 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-bindings-android.yml b/.github/workflows/build-bindings-android.yml index 881d190..c5ad942 100644 --- a/.github/workflows/build-bindings-android.yml +++ b/.github/workflows/build-bindings-android.yml @@ -49,6 +49,12 @@ jobs: rustup target add ${{ matrix.target }} cargo install cargo-ndk + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + version: "27.2" + repo-token: ${{ secrets.GITHUB_TOKEN }} + - uses: Swatinem/rust-cache@v2 with: workspaces: lib diff --git a/.github/workflows/build-bindings-darwin.yml b/.github/workflows/build-bindings-darwin.yml index 51da151..4734b97 100644 --- a/.github/workflows/build-bindings-darwin.yml +++ b/.github/workflows/build-bindings-darwin.yml @@ -47,6 +47,12 @@ jobs: rustup target add ${{ matrix.target }} cargo install cargo-lipo + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + version: "27.2" + repo-token: ${{ secrets.GITHUB_TOKEN }} + - uses: Swatinem/rust-cache@v2 with: workspaces: lib diff --git a/.github/workflows/build-bindings-ios.yml b/.github/workflows/build-bindings-ios.yml index 89f891e..c4f1df6 100644 --- a/.github/workflows/build-bindings-ios.yml +++ b/.github/workflows/build-bindings-ios.yml @@ -47,6 +47,12 @@ jobs: rustup toolchain install stable --profile minimal rustup target add ${{ matrix.target }} + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + version: "27.2" + repo-token: ${{ secrets.GITHUB_TOKEN }} + - uses: Swatinem/rust-cache@v2 with: workspaces: lib diff --git a/.github/workflows/build-bindings-linux.yml b/.github/workflows/build-bindings-linux.yml index 0b39a50..19c050d 100644 --- a/.github/workflows/build-bindings-linux.yml +++ b/.github/workflows/build-bindings-linux.yml @@ -46,6 +46,12 @@ jobs: rustup toolchain install stable --profile minimal rustup target add ${{ matrix.target }} + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + version: "27.2" + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Install gcc-aarch64-linux-gnu if: matrix.target == 'aarch64-unknown-linux-gnu' run: | diff --git a/.github/workflows/build-bindings-windows.yml b/.github/workflows/build-bindings-windows.yml index 6517946..4134e47 100644 --- a/.github/workflows/build-bindings-windows.yml +++ b/.github/workflows/build-bindings-windows.yml @@ -46,6 +46,12 @@ jobs: rustup toolchain install stable --profile minimal rustup target add ${{ matrix.target }} + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + version: "27.2" + repo-token: ${{ secrets.GITHUB_TOKEN }} + - uses: Swatinem/rust-cache@v2 with: workspaces: lib diff --git a/.github/workflows/build-language-bindings.yml b/.github/workflows/build-language-bindings.yml index 7ff29bc..0b6808e 100644 --- a/.github/workflows/build-language-bindings.yml +++ b/.github/workflows/build-language-bindings.yml @@ -72,6 +72,12 @@ jobs: rustup set auto-self-update disable rustup toolchain install stable --profile minimal + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + version: "27.2" + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Build Kotlin binding if: ${{ inputs.kotlin }} working-directory: lib/bindings diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ed1b42..4d88312 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,9 +41,9 @@ jobs: cli -> target - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v3 with: - version: "23.4" + version: "27.2" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Check Rust Clippy @@ -66,9 +66,9 @@ jobs: cli -> target - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v3 with: - version: "23.4" + version: "27.2" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Run sdk-core tests @@ -89,9 +89,9 @@ jobs: cli -> target - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v3 with: - version: "23.4" + version: "27.2" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Build bindings @@ -227,9 +227,9 @@ jobs: lib -> target - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v3 with: - version: "23.4" + version: "27.2" repo-token: ${{ secrets.GITHUB_TOKEN }} - name: test-new-project-with-sdk-dependency