Skip to content

Commit

Permalink
Add Swift 5.6 to the matrix for Linux (and fix cache issues) (#479)
Browse files Browse the repository at this point in the history
* Only cache on root Package.{swift,resolved}

* Add Swift 5.6 to test matrix (Linux)
  • Loading branch information
liamnichols authored Apr 15, 2022
1 parent cc5ae9a commit 8344068
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
path: |
.build
Package.resolved
key: ${{ runner.os }}-${{ matrix.xcode }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('**/Package.swift', '**/Package.resolved') }}
key: ${{ runner.os }}-${{ matrix.xcode }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('Package.swift', 'Package.resolved') }}
restore-keys: |
${{ runner.os }}-${{ matrix.xcode }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-
- name: Resolve dependencies
Expand All @@ -59,8 +59,11 @@ jobs:
strategy:
fail-fast: false
matrix:
swift: ["5.5", "5.4", "5.3"]
swift: ["5.6", "5.5", "5.4", "5.3"]
include:
- swift: "5.6"
container: "swift:5.6"
cache-version: 2
- swift: "5.5"
container: "swift:5.5"
cache-version: 2
Expand All @@ -87,7 +90,7 @@ jobs:
path: |
.build
Package.resolved
key: ${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('**/Package.swift', '**/Package.resolved') }}
key: ${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('Package.swift', 'Package.resolved') }}
restore-keys: |
${{ matrix.cache-version }}-${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-
- name: Resolve dependencies
Expand All @@ -98,4 +101,4 @@ jobs:
- name: Test
run: ${{ env.swift_test }} --enable-test-discovery
- name: Scan
run: ${{ env.periphery_scan }} --config .periphery.linux.yml
run: ${{ env.periphery_scan }} --config .periphery.linux.yml

0 comments on commit 8344068

Please sign in to comment.