From 7244e7a39304b17319a519a3dc73fb8a8b3ea251 Mon Sep 17 00:00:00 2001 From: Pepper Lebeck-Jobe Date: Mon, 20 Jan 2025 09:47:52 +0100 Subject: [PATCH] Add cbindgen to both workflows It turns out that the ci.yml workflow was also failing because of the removal of cbindgen from the Ubuntu 24.04 image used by the GitHub action runners. This change also moves the installation of cbindgen earlier in the codequl-analysis.yml file and expands the scope of what is cached after a rust installation to include the cbindgen binary (which is installed in ~/.cargo/bin) --- .github/workflows/ci.yml | 3 +++ .github/workflows/codeql-analysis.yml | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e9c7e1bf4..32f50917d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,6 +74,9 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 + + - name: Install cbindgen + run: cargo install --force cbindgen - name: Cache Build Products uses: actions/cache@v3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 247f434ea0..f9a46a92c3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -81,12 +81,14 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 + - name: Install cbindgen + run: cargo install --force cbindgen + - name: Cache Rust Build Products uses: actions/cache@v3 with: path: | - ~/.cargo/registry/ - ~/.cargo/git/ + ~/.cargo/ arbitrator/target/ arbitrator/wasm-libraries/target/ arbitrator/wasm-libraries/soft-float/SoftFloat/build @@ -128,7 +130,7 @@ jobs: restore-keys: ${{ runner.os }}-go- - name: Build all lint dependencies - run: cargo install --force cbindgen && make -j build-node-deps + run: make -j build-node-deps # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun