diff options
| author | Linus Färnstrand <faern@faern.net> | 2023-01-12 10:48:31 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-01-12 17:22:09 +0100 |
| commit | a8d34c216772aa7709d85a6afa531c82fdfc7084 (patch) | |
| tree | 0980e17ef48bb99c4182169b74de1aa7a448f105 | |
| parent | df09c879d168d17b925faef74cd8962d0338d0fa (diff) | |
| download | mullvadvpn-a8d34c216772aa7709d85a6afa531c82fdfc7084.tar.xz mullvadvpn-a8d34c216772aa7709d85a6afa531c82fdfc7084.zip | |
Run cargo udeps towards the Android target also
| -rw-r--r-- | .github/workflows/rust-unused-dependencies.yml | 51 |
1 files changed, 37 insertions, 14 deletions
diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml index 8f4b2c4f21..24209855f3 100644 --- a/.github/workflows/rust-unused-dependencies.yml +++ b/.github/workflows/rust-unused-dependencies.yml @@ -8,29 +8,25 @@ on: # Check if requested manually from the Actions tab workflow_dispatch: jobs: - prepare-linux: + prepare-containers: runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - - name: Use custom container image if specified - if: "${{ github.event.inputs.override_container_image != '' }}" - run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}" >> $GITHUB_ENV - - - name: Use default container image and resolve digest - if: "${{ github.event.inputs.override_container_image == '' }}" + - name: Fetch container image names run: | - echo "inner_container_image=$(cat ./building/linux-container-image.txt)" >> $GITHUB_ENV + echo "inner_container_image_linux=$(cat ./building/linux-container-image.txt)" >> $GITHUB_ENV + echo "inner_container_image_android=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV outputs: - container_image: "${{ env.inner_container_image }}" + container_image_linux: "${{ env.inner_container_image_linux }}" + container_image_android: "${{ env.inner_container_image_android }}" cargo-udeps-linux: - needs: prepare-linux + needs: prepare-containers runs-on: ubuntu-latest container: - image: "${{ needs.prepare-linux.outputs.container_image }}" + image: "${{ needs.prepare-containers.outputs.container_image_linux }}" steps: # Fix for HOME path overridden by GH runners when building in containers, see: @@ -44,7 +40,7 @@ jobs: - name: Checkout binaries submodule run: git submodule update --init --depth=1 dist-assets/binaries - - name: Install nighly Rust toolchain + - name: Install nightly Rust toolchain run: rustup default nightly - uses: taiki-e/install-action@v2 @@ -55,6 +51,33 @@ jobs: shell: bash run: source env.sh && cargo +nightly udeps --workspace + cargo-udeps-android: + needs: prepare-containers + runs-on: ubuntu-latest + container: + image: "${{ needs.prepare-containers.outputs.container_image_android }}" + + steps: + # Fix for HOME path overridden by GH runners when building in containers, see: + # https://github.com/actions/runner/issues/863 + - name: Fix HOME path + run: echo "HOME=/root" >> $GITHUB_ENV + + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install nightly Rust toolchain + run: | + rustup default nightly + rustup target add aarch64-linux-android --toolchain nightly + + - uses: taiki-e/install-action@v2 + with: + tool: cargo-udeps + + - name: Check for unused dependencies + run: cargo +nightly udeps --target aarch64-linux-android --package mullvad-jni + cargo-udeps: strategy: matrix: |