Merge pull request github#11454 from erik-krogh/swift-test

Swift: CI cache fixes

Author: redsun82

.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

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: |