From 31d8fae9eed56f6f7fdccfb1a7f62fe19123224d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danny=20M=C3=B6sch?= Date: Sat, 29 Nov 2025 12:16:14 +0100 Subject: [PATCH] Set explicit OS with version in cache keys --- .github/workflows/copilot-setup-steps.yml | 4 ++-- .github/workflows/docs.yml | 4 ++-- .github/workflows/test.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index bf8003d670..37d240691a 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -24,8 +24,8 @@ jobs: run: echo "version=$(swift --version | grep '[5-9]\.[0-9]\+\(\.[0-9]\)\?' -o | head -1)" >> "$GITHUB_OUTPUT" - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 with: - key: ${{ runner.os }}-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }} - restore-keys: ${{ runner.os }}-spm-${{ steps.swift_version.outputs.version }}- + key: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }} + restore-keys: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}- path: .build - name: Build everything run: swift build --build-tests diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fa5752c205..02d1b21c86 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -29,8 +29,8 @@ jobs: run: echo "version=$(swift --version | grep '[5-9]\.[0-9]\+\(\.[0-9]\)\?' -o | head -1)" >> "$GITHUB_OUTPUT" - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 with: - key: ${{ runner.os }}-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }} - restore-keys: ${{ runner.os }}-spm-${{ steps.swift_version.outputs.version }}- + key: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }} + restore-keys: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}- path: .build - name: Generate documentation run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54cee8db4d..0aeab56f0a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,8 +25,8 @@ jobs: run: echo "version=$(swift --version | grep '[5-9]\.[0-9]\+\(\.[0-9]\)\?' -o | head -1)" >> "$GITHUB_OUTPUT" - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 with: - key: ${{ runner.os }}-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }} - restore-keys: ${{ runner.os }}-spm-${{ steps.swift_version.outputs.version }}- + key: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}-${{ hashFiles('Package.resolved', 'Package.swift') }} + restore-keys: ubuntu-24.04-spm-${{ steps.swift_version.outputs.version }}- path: .build - name: Run tests uses: ./.github/actions/run-make @@ -53,8 +53,8 @@ jobs: persist-credentials: false - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 with: - key: ${{ runner.os }}-xcode-spm-${{ matrix.xcode }}-${{ hashFiles('Package.resolved', 'Package.swift') }} - restore-keys: ${{ runner.os }}-xcode-spm-${{ matrix.xcode }}- + key: macos-${{ matrix.macOS }}-xcode-spm-${{ matrix.xcode }}-${{ hashFiles('Package.resolved', 'Package.swift') }} + restore-keys: macos-${{ matrix.macOS }}-xcode-spm-${{ matrix.xcode }}- path: .build - name: Run tests run: make spm_test