From d810c310ab6cdad6850997c74c5d2a4f3184bd02 Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Mon, 22 Jul 2024 12:20:50 +0100 Subject: [PATCH 1/4] Updates to CI and dependabot config. --- .github/dependabot.yml | 4 ++++ .github/workflows/ci.yml | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8d288ca..fb2c989 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,7 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd86475..2fc9dee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,17 +13,24 @@ jobs: os: [macos-12, ubuntu-20.04] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 - - run: swift build --disable-automatic-resolution -c release + - uses: actions/checkout@v4 + - uses: fwal/setup-swift@v2 + - name: Echo Swift version + run: swift --version + - name: Check a Release build + run: swift build --disable-automatic-resolution -c release run-tests: strategy: matrix: - swift-version: [5.6, 5.7, 5.8, 5.9] + swift-version: [5.6, 5.7, 5.8, 5.9, 5.10] runs-on: ubuntu-20.04 steps: - - uses: fwal/setup-swift@v1 + - uses: actions/checkout@v4 + - uses: fwal/setup-swift@v2 with: swift-version: ${{ matrix.swift-version }} - - uses: actions/checkout@v2 - - run: swift test + - name: Echo Swift version + run: swift --version + - name: Test + run: swift test From 546ec74ec83c3814e2871f187bf5fc127bc8f827 Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Mon, 22 Jul 2024 12:30:11 +0100 Subject: [PATCH 2/4] Distinguish 5.10 from 5.1! --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fc9dee..f085f24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,8 @@ jobs: run-tests: strategy: matrix: - swift-version: [5.6, 5.7, 5.8, 5.9, 5.10] + # We don't need anything specific in 5.10.1, but 5.10 collapses to 5.1 when `swift-setup` runs. + swift-version: [5.6, 5.7, 5.8, 5.9, 5.10.1] runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 From 70bd906e21f285908e406cf7a2b54e0e8fac3cd8 Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Mon, 22 Jul 2024 12:51:23 +0100 Subject: [PATCH 3/4] Better solution than specifying a patch version! Co-authored-by: Sven A. Schmidt --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f085f24..4596289 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: # We don't need anything specific in 5.10.1, but 5.10 collapses to 5.1 when `swift-setup` runs. - swift-version: [5.6, 5.7, 5.8, 5.9, 5.10.1] + swift-version: ['5.6', '5.7', '5.8', '5.9', '5.10'] runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 From c881e85b2b8aa6d7dc6ad177775f9ed6ba7ad106 Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Mon, 22 Jul 2024 12:52:21 +0100 Subject: [PATCH 4/4] Unnecessary comment. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4596289..c527b21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,6 @@ jobs: run-tests: strategy: matrix: - # We don't need anything specific in 5.10.1, but 5.10 collapses to 5.1 when `swift-setup` runs. swift-version: ['5.6', '5.7', '5.8', '5.9', '5.10'] runs-on: ubuntu-20.04 steps: