From 751ffbd9c898f301c341e9abee4ace799b3eff49 Mon Sep 17 00:00:00 2001 From: erik-krogh Date: Mon, 28 Nov 2022 14:44:07 +0100 Subject: [PATCH 1/2] use different keys for different caches --- swift/actions/run-integration-tests/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/actions/run-integration-tests/action.yml b/swift/actions/run-integration-tests/action.yml index 6e190693a55..00ef006ea09 100644 --- a/swift/actions/run-integration-tests/action.yml +++ b/swift/actions/run-integration-tests/action.yml @@ -20,7 +20,7 @@ runs: - id: query-cache uses: ./.github/actions/cache-query-compilation with: - key: swift-qltest + key: swift-integration - name: Run integration tests shell: bash run: | From d2824413db9596ce2699f08cbe8ebd4754f28b4b Mon Sep 17 00:00:00 2001 From: erik-krogh Date: Mon, 28 Nov 2022 14:44:34 +0100 Subject: [PATCH 2/2] skip the only remaining macos job running on main --- .github/workflows/swift.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 2baae15f270..4871442d4b7 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -35,6 +35,7 @@ jobs: # not using a matrix as you cannot depend on a specific job in a matrix, and we want to start linux checks # without waiting for the macOS build build-and-test-macos: + if: ${{ github.event_name == 'pull_request' }} runs-on: macos-12-xl steps: - uses: actions/checkout@v3