From 41dc2509900c15707da3da565d083a43660da5fc Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Tue, 15 Oct 2024 15:15:09 +0200 Subject: [PATCH 1/9] PYLABS-213 Upgrade with new swift toolchain --- .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 8c53fa0..0712b43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, macos-11] - swift: ["5.5"] + swift: ["5.5", "6.0"] runs-on: ${{ matrix.os }} From 95a63b5b2d3fecd37c8fefc4ef5b0b5b86b0758c Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Tue, 15 Oct 2024 15:21:07 +0200 Subject: [PATCH 2/9] PYLABS-213 Upgrade with new swift toolchain --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0712b43..beef65c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,12 +18,15 @@ jobs: strategy: matrix: os: [ubuntu-20.04, macos-11] - swift: ["5.5", "6.0"] + swift: ["5.5", "5.10"] + include: + - os: ubuntu-22.04 + swift: ["6.0"] runs-on: ${{ matrix.os }} steps: - - uses: fwal/setup-swift@v1 + - uses: fwal/setup-swift@v2 with: swift-version: ${{ matrix.swift }} From 26c65ca34f07edc17a957ac0b9c592d6a83266b4 Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Tue, 15 Oct 2024 15:26:55 +0200 Subject: [PATCH 3/9] PYLABS-213 Upgrade with new swift toolchain --- .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 beef65c..f41403f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: swift: ["5.5", "5.10"] include: - os: ubuntu-22.04 - swift: ["6.0"] + swift: "6.0" runs-on: ${{ matrix.os }} From 0483e68175782f8e4f6bc48c3eeb64109c0208d2 Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Tue, 15 Oct 2024 15:55:34 +0200 Subject: [PATCH 4/9] PYLABS-213 Upgrade with new swift toolchain --- .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 f41403f..4206fad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: os: [ubuntu-20.04, macos-11] swift: ["5.5", "5.10"] include: - - os: ubuntu-22.04 + - os: macos-15 swift: "6.0" runs-on: ${{ matrix.os }} From 37ee83f1f6cc4776a8fcb2ae71c16ff63f23dde5 Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Wed, 16 Oct 2024 11:37:57 +0200 Subject: [PATCH 5/9] PYLABS-213 Upgrade with new swift toolchain --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4206fad..0be4034 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-11] + os: [ubuntu-20.04, macos-latest] swift: ["5.5", "5.10"] include: - os: macos-15 @@ -26,14 +26,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: fwal/setup-swift@v2 + - uses: swift-actions/setup-swift with: swift-version: ${{ matrix.swift }} - name: Get swift version run: swift --version - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Run tests run: swift test From b155852aa79b0350635a8d9e964d030341d5a071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=AA=20vi4m=20Marcin=20Kliks?= Date: Wed, 16 Oct 2024 14:10:13 +0200 Subject: [PATCH 6/9] Separte macos and linux builds --- .github/workflows/ci.yml | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0be4034..64a12c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,10 @@ on: push: branches: - master + paths: + - '**.swift' + - '**.yml' + pull_request: branches: - master @@ -12,24 +16,42 @@ on: - created jobs: - build: + macos: name: Swift ${{ matrix.swift }} on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-latest] - swift: ["5.5", "5.10"] - include: - - os: macos-15 - swift: "6.0" + os: [macos-11] + swift: ["5.5"] runs-on: ${{ matrix.os }} steps: - - uses: swift-actions/setup-swift + - uses: fwal/setup-swift@v1 with: swift-version: ${{ matrix.swift }} + - name: Get swift version + run: swift --version + + - uses: actions/checkout@v2 + + - name: Run tests + run: swift test + + linux: + name: Swift ${{ matrix.swift }} on ubuntu-latest + runs-on: ubuntu-latest + + strategy: + matrix: + image: ["swift:5.5", "swift:5.9", "swift:5.10", "swift:6.0"] + + container: + image: ${{ matrix.image }} + + steps: + - name: Get swift version run: swift --version @@ -37,3 +59,4 @@ jobs: - name: Run tests run: swift test + From cba358eead780d01e825cf95da703434107497fc Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Wed, 16 Oct 2024 14:17:45 +0200 Subject: [PATCH 7/9] PYLABS-213 Upgrade with new swift toolchain --- .github/workflows/ci.yml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64a12c3..2ad87b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,31 +16,8 @@ on: - created jobs: - macos: - name: Swift ${{ matrix.swift }} on ${{ matrix.os }} - - strategy: - matrix: - os: [macos-11] - swift: ["5.5"] - - runs-on: ${{ matrix.os }} - - steps: - - uses: fwal/setup-swift@v1 - with: - swift-version: ${{ matrix.swift }} - - - name: Get swift version - run: swift --version - - - uses: actions/checkout@v2 - - - name: Run tests - run: swift test - linux: - name: Swift ${{ matrix.swift }} on ubuntu-latest + name: Swift ${{ matrix.image }} on ubuntu-latest runs-on: ubuntu-latest strategy: From 872b72b5d8ed87fb102e5f41e3d7efc70c7bf5aa Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Wed, 16 Oct 2024 14:25:18 +0200 Subject: [PATCH 8/9] PYLABS-213 Upgrade with new swift toolchain --- .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 2ad87b0..ffe4eff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: - image: ["swift:5.5", "swift:5.9", "swift:5.10", "swift:6.0"] + image: ["swift:5.9", "swift:5.10", "swift:6.0"] container: image: ${{ matrix.image }} From f81253f8fd4a76faf429ff84fafa2cb00af48338 Mon Sep 17 00:00:00 2001 From: Marcin Kliks Date: Wed, 16 Oct 2024 14:27:18 +0200 Subject: [PATCH 9/9] PYLABS-213 Upgrade with new swift toolchain --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffe4eff..b89d199 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,10 @@ on: types: - created +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-ci + cancel-in-progress: true + jobs: linux: name: Swift ${{ matrix.image }} on ubuntu-latest