From cbbe859eba56371cc91c38b52de03974405c3105 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Tue, 17 Oct 2023 15:11:34 +0200 Subject: [PATCH] Make sure correct targets for building rerun_c are installed (#3895) ### What ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/3895) (if applicable) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG - [PR Build Summary](https://build.rerun.io/pr/3895) - [Docs preview](https://rerun.io/preview/31ab21163052dc78ee2c0834efb040b514dd21bd/docs) - [Examples preview](https://rerun.io/preview/31ab21163052dc78ee2c0834efb040b514dd21bd/examples) - [Recent benchmark results](https://ref.rerun.io/dev/bench/) - [Wasm size tracking](https://ref.rerun.io/dev/sizes/) --- .github/actions/setup-rust/action.yml | 9 +++++++++ .github/workflows/reusable_build_and_upload_rerun_c.yml | 1 + 2 files changed, 10 insertions(+) diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index cbc4341f2bc6..9007e3e8fb1a 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -26,6 +26,10 @@ inputs: service_account: type: string required: true + targets: + type: string + required: false + description: "One or more space separated target triplets that will be ensured to be supported." runs: using: "composite" @@ -44,6 +48,11 @@ runs: rustup show shell: bash + - name: Install additional targets + if: ${{ inputs.targets != '' }} + run: rustup target add ${{ inputs.targets }} + shell: bash + # Rust-cache will cache our dependencies, which is a large chunk of the build # See: https://github.com/Swatinem/rust-cache - name: Set up rust-cache diff --git a/.github/workflows/reusable_build_and_upload_rerun_c.yml b/.github/workflows/reusable_build_and_upload_rerun_c.yml index d156d90311fd..996dbf3575d1 100644 --- a/.github/workflows/reusable_build_and_upload_rerun_c.yml +++ b/.github/workflows/reusable_build_and_upload_rerun_c.yml @@ -152,6 +152,7 @@ jobs: save_cache: false workload_identity_provider: ${{ secrets.GOOGLE_WORKLOAD_IDENTITY_PROVIDER }} service_account: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }} + targets: ${{ needs.set-config.outputs.TARGET }} - name: Build rerun_c (release) uses: actions-rs/cargo@v1