From 3b9562af6ff99cd125bf47ada301db9101a03f53 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Mon, 18 Aug 2025 07:00:20 -0700 Subject: [PATCH 1/6] Run CI on Swift 6.1 in Linux too --- .github/workflows/ci.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68af125..0da2320 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,8 +86,8 @@ jobs: run: sudo xcode-select --switch /Applications/Xcode_16.app/Contents/Developer - name: Build and Test Framework run: xcrun swift test -c release -Xswiftc -enable-testing - linux: - name: "Build and Test on Linux" + linux-6-0: + name: "Build and Test on Linux Swift 6.0" runs-on: ubuntu-24.04 container: swift:6.0 permissions: @@ -103,6 +103,23 @@ jobs: - name: Upload Coverage Reports if: success() uses: codecov/codecov-action@v4 + linux-6-1: + name: "Build and Test on Linux Swift 6.1" + runs-on: ubuntu-24.04 + container: swift:6.1 + permissions: + contents: read + steps: + - name: Checkout Repo + uses: actions/checkout@v5 + - name: Build and Test Framework + run: swift test -c release --enable-code-coverage -Xswiftc -enable-testing + - name: Prepare Coverage Reports + run: | + llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/release/swift-async-queuePackageTests.xctest -instr-profile .build/x86_64-unknown-linux-gnu/release/codecov/default.profdata > coverage.lcov + - name: Upload Coverage Reports + if: success() + uses: codecov/codecov-action@v4 readme-validation: name: Check Markdown links runs-on: ubuntu-latest From 2cabeecd3e0b401a931cf77e80a25fd651273957 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Mon, 18 Aug 2025 07:10:11 -0700 Subject: [PATCH 2/6] Bump codecov --- .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 0da2320..a4d168c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: run: ./Scripts/prepare-coverage-reports.sh - name: Upload Coverage Reports if: success() - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} spm-16-swift: @@ -102,7 +102,7 @@ jobs: llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/release/swift-async-queuePackageTests.xctest -instr-profile .build/x86_64-unknown-linux-gnu/release/codecov/default.profdata > coverage.lcov - name: Upload Coverage Reports if: success() - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 linux-6-1: name: "Build and Test on Linux Swift 6.1" runs-on: ubuntu-24.04 @@ -119,7 +119,7 @@ jobs: llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/release/swift-async-queuePackageTests.xctest -instr-profile .build/x86_64-unknown-linux-gnu/release/codecov/default.profdata > coverage.lcov - name: Upload Coverage Reports if: success() - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 readme-validation: name: Check Markdown links runs-on: ubuntu-latest From 012bcd8889b1976e8ac500f7c8c48187401bd0a1 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Mon, 18 Aug 2025 08:15:10 -0700 Subject: [PATCH 3/6] fail if error --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4d168c..d1d658b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,8 @@ jobs: if: success() uses: codecov/codecov-action@v5 with: - token: ${{ secrets.CODECOV_TOKEN }} + fail_ci_if_error: true + verbose: true spm-16-swift: name: Swift Build Xcode 16 runs-on: macos-15 @@ -103,6 +104,9 @@ jobs: - name: Upload Coverage Reports if: success() uses: codecov/codecov-action@v5 + with: + fail_ci_if_error: true + verbose: true linux-6-1: name: "Build and Test on Linux Swift 6.1" runs-on: ubuntu-24.04 @@ -120,6 +124,9 @@ jobs: - name: Upload Coverage Reports if: success() uses: codecov/codecov-action@v5 + with: + fail_ci_if_error: true + verbose: true readme-validation: name: Check Markdown links runs-on: ubuntu-latest From f10965c981634a503e50a20049e96af9a1f71adf Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Mon, 18 Aug 2025 08:50:00 -0700 Subject: [PATCH 4/6] Use setup-swift instead of container --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1d658b..c4fa179 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,12 +90,15 @@ jobs: linux-6-0: name: "Build and Test on Linux Swift 6.0" runs-on: ubuntu-24.04 - container: swift:6.0 permissions: contents: read steps: - name: Checkout Repo uses: actions/checkout@v5 + - name: Setup Swift 6.0 + uses: swift-actions/setup-swift@v2 + with: + swift-version: "6.0" - name: Build and Test Framework run: swift test -c release --enable-code-coverage -Xswiftc -enable-testing - name: Prepare Coverage Reports @@ -110,12 +113,15 @@ jobs: linux-6-1: name: "Build and Test on Linux Swift 6.1" runs-on: ubuntu-24.04 - container: swift:6.1 permissions: contents: read steps: - name: Checkout Repo uses: actions/checkout@v5 + - name: Setup Swift 6.1 + uses: swift-actions/setup-swift@v2 + with: + swift-version: "6.1" - name: Build and Test Framework run: swift test -c release --enable-code-coverage -Xswiftc -enable-testing - name: Prepare Coverage Reports From 5236536a1615388c0051bb05948cad018928ea43 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Mon, 18 Aug 2025 08:59:05 -0700 Subject: [PATCH 5/6] Revert "Use setup-swift instead of container" This reverts commit f10965c981634a503e50a20049e96af9a1f71adf. --- .github/workflows/ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4fa179..d1d658b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,15 +90,12 @@ jobs: linux-6-0: name: "Build and Test on Linux Swift 6.0" runs-on: ubuntu-24.04 + container: swift:6.0 permissions: contents: read steps: - name: Checkout Repo uses: actions/checkout@v5 - - name: Setup Swift 6.0 - uses: swift-actions/setup-swift@v2 - with: - swift-version: "6.0" - name: Build and Test Framework run: swift test -c release --enable-code-coverage -Xswiftc -enable-testing - name: Prepare Coverage Reports @@ -113,15 +110,12 @@ jobs: linux-6-1: name: "Build and Test on Linux Swift 6.1" runs-on: ubuntu-24.04 + container: swift:6.1 permissions: contents: read steps: - name: Checkout Repo uses: actions/checkout@v5 - - name: Setup Swift 6.1 - uses: swift-actions/setup-swift@v2 - with: - swift-version: "6.1" - name: Build and Test Framework run: swift test -c release --enable-code-coverage -Xswiftc -enable-testing - name: Prepare Coverage Reports From 45851a179144c7b15d6ce503cadf100996dde27e Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Mon, 18 Aug 2025 08:59:24 -0700 Subject: [PATCH 6/6] Install curl --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1d658b..2d3550a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,10 @@ jobs: - name: Prepare Coverage Reports run: | llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/release/swift-async-queuePackageTests.xctest -instr-profile .build/x86_64-unknown-linux-gnu/release/codecov/default.profdata > coverage.lcov + - name: Install curl for Codecov + run: | + apt-get update + apt-get install -y --no-install-recommends curl ca-certificates - name: Upload Coverage Reports if: success() uses: codecov/codecov-action@v5 @@ -121,6 +125,10 @@ jobs: - name: Prepare Coverage Reports run: | llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/release/swift-async-queuePackageTests.xctest -instr-profile .build/x86_64-unknown-linux-gnu/release/codecov/default.profdata > coverage.lcov + - name: Install curl for Codecov + run: | + apt-get update + apt-get install -y --no-install-recommends curl ca-certificates - name: Upload Coverage Reports if: success() uses: codecov/codecov-action@v5