From c1239bb20896341a2d8bfcbd0486876ae3e82e65 Mon Sep 17 00:00:00 2001 From: Leah Date: Mon, 9 Jan 2023 16:30:51 +0100 Subject: [PATCH] last fixes --- .github/actions/build-debug-turborepo/action.yml | 7 +------ .github/actions/setup-rust/action.yml | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/actions/build-debug-turborepo/action.yml b/.github/actions/build-debug-turborepo/action.yml index d6d0d52db7377..c7fa764b70e3d 100644 --- a/.github/actions/build-debug-turborepo/action.yml +++ b/.github/actions/build-debug-turborepo/action.yml @@ -21,16 +21,11 @@ runs: - name: "Setup Rust" uses: ./.github/actions/setup-rust with: + target: ${{ inputs.target }} shared-cache-key: turborepo-debug-build cache-key: ${{ inputs.target }} save-cache: true - - name: "Set Windows default host to MingW" - if: ${{ inputs.target == 'windows' }} - shell: bash - run: | - rustup set default-host x86_64-pc-windows-gnu && rustup show - - name: Build Turborepo working-directory: ./cli shell: bash diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index 94ad4b076be9a..2f0169de2338f 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -54,5 +54,4 @@ runs: key: ${{ inputs.cache-key }} prefix-key: rust-cache-test # the cache is huge and we only get 10gb max, so we only save on master - # TODO: remove PR branch - save-if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/pull/3175/merge') && inputs.save-cache || 'false' }} + save-if: ${{ github.ref == 'refs/heads/main' && inputs.save-cache || 'false' }}