From 6fcdb45b4af8d84aae57992155a3fd0bbd0d05ff Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Mon, 3 Mar 2025 10:17:47 -0800 Subject: [PATCH 1/9] Fix Windows CI --- .github/workflows/ci.yml | 45 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2033d8..f02e798 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - windows-ci-fix pull_request: branches: - '*' @@ -112,28 +113,28 @@ jobs: - name: Build run: swift build --target IssueReporting --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024)) - # windows: - # name: Windows - # strategy: - # matrix: - # os: [windows-latest] - # config: - # - debug - # - release - # fail-fast: false - # runs-on: ${{ matrix.os }} - # steps: - # - uses: compnerd/gha-setup-swift@main - # with: - # branch: swift-6.0.3-release - # tag: 6.0.3-RELEASE - # - name: Set long paths - # run: git config --system core.longpaths true - # - uses: actions/checkout@v4 - # - name: Build - # run: swift build -c ${{ matrix.config }} - # - name: Run tests (debug only) - # run: swift test + windows: + name: Windows + strategy: + matrix: + os: [windows-latest] + config: + - debug + - release + fail-fast: false + runs-on: ${{ matrix.os }} + steps: + - uses: compnerd/gha-setup-swift@main + with: + branch: swift-6.0.3-release + tag: 6.0.3-RELEASE + - name: Set long paths + run: git config --system core.longpaths true + - uses: actions/checkout@v4 + - name: Build + run: swift build -c ${{ matrix.config }} + - name: Run tests (debug only) + run: swift test -windows-sdk-version 10.0.26100.0 android: name: Android From 97ad1d1d5903aaf2d9be5b8db051848fef4ebe64 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Mon, 3 Mar 2025 10:18:25 -0800 Subject: [PATCH 2/9] wip --- .github/workflows/ci.yml | 196 +++++++++++++++++++-------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f02e798..af8bd24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,103 +15,103 @@ concurrency: cancel-in-progress: true jobs: - macos-15: - strategy: - matrix: - config: - - debug - - release - xcode: - - '16.2' - name: macOS 15 - runs-on: macos-15 - steps: - - uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - - name: Run tests - run: make test-${{ matrix.config }} + # macos-15: + # strategy: + # matrix: + # config: + # - debug + # - release + # xcode: + # - '16.2' + # name: macOS 15 + # runs-on: macos-15 + # steps: + # - uses: actions/checkout@v4 + # - name: Select Xcode + # run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app + # - name: Run tests + # run: make test-${{ matrix.config }} - macos-14: - strategy: - matrix: - config: - - debug - - release - xcode: - - 15.2 - - 15.4 - name: macOS 14 - runs-on: macos-14 - steps: - - uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - - name: Run tests - run: make test-${{ matrix.config }} + # macos-14: + # strategy: + # matrix: + # config: + # - debug + # - release + # xcode: + # - 15.2 + # - 15.4 + # name: macOS 14 + # runs-on: macos-14 + # steps: + # - uses: actions/checkout@v4 + # - name: Select Xcode + # run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app + # - name: Run tests + # run: make test-${{ matrix.config }} - library-evolution: - name: Library evolution - runs-on: macos-15 - steps: - - uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_16.2.app - - name: Run tests - run: make build-for-library-evolution + # library-evolution: + # name: Library evolution + # runs-on: macos-15 + # steps: + # - uses: actions/checkout@v4 + # - name: Select Xcode + # run: sudo xcode-select -s /Applications/Xcode_16.2.app + # - name: Run tests + # run: make build-for-library-evolution - examples: - strategy: - matrix: - config: - - Debug - - Release - xcode: - - '16.2' - name: Examples - runs-on: macos-15 - steps: - - uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - - name: Run tests - run: make CONFIG=${{ matrix.config }} test-examples + # examples: + # strategy: + # matrix: + # config: + # - Debug + # - Release + # xcode: + # - '16.2' + # name: Examples + # runs-on: macos-15 + # steps: + # - uses: actions/checkout@v4 + # - name: Select Xcode + # run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app + # - name: Run tests + # run: make CONFIG=${{ matrix.config }} test-examples - linux: - strategy: - matrix: - config: - - debug - - release - name: Linux - runs-on: ubuntu-latest - container: swift:6.0.3 - steps: - - uses: actions/checkout@v4 - - name: Install dependencies - run: apt-get update && apt-get install -y build-essential libcurl4-openssl-dev - - name: Run tests - run: make test-${{ matrix.config }} - - name: Build for static-stdlib - run: make CONFIG=${{ matrix.config }} build-for-static-stdlib + # linux: + # strategy: + # matrix: + # config: + # - debug + # - release + # name: Linux + # runs-on: ubuntu-latest + # container: swift:6.0.3 + # steps: + # - uses: actions/checkout@v4 + # - name: Install dependencies + # run: apt-get update && apt-get install -y build-essential libcurl4-openssl-dev + # - name: Run tests + # run: make test-${{ matrix.config }} + # - name: Build for static-stdlib + # run: make CONFIG=${{ matrix.config }} build-for-static-stdlib - wasm: - name: Wasm - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: bytecodealliance/actions/wasmtime/setup@v1 - - name: Install Swift and Swift SDK for WebAssembly - run: | - PREFIX=/opt/swift - set -ex - curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz" - sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1 - $PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.2-RELEASE/swift-wasm-6.0.2-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4 - echo "$PREFIX/usr/bin" >> $GITHUB_PATH + # wasm: + # name: Wasm + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: bytecodealliance/actions/wasmtime/setup@v1 + # - name: Install Swift and Swift SDK for WebAssembly + # run: | + # PREFIX=/opt/swift + # set -ex + # curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz" + # sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1 + # $PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.2-RELEASE/swift-wasm-6.0.2-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4 + # echo "$PREFIX/usr/bin" >> $GITHUB_PATH - - name: Build - run: swift build --target IssueReporting --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024)) + # - name: Build + # run: swift build --target IssueReporting --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024)) windows: name: Windows @@ -136,10 +136,10 @@ jobs: - name: Run tests (debug only) run: swift test -windows-sdk-version 10.0.26100.0 - android: - name: Android - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: "Test Swift Package on Android" - uses: skiptools/swift-android-action@v2 + # android: + # name: Android + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - name: "Test Swift Package on Android" + # uses: skiptools/swift-android-action@v2 From fffba3ef420108e3b22bb34f55a47595d39742e0 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Mon, 3 Mar 2025 10:25:02 -0800 Subject: [PATCH 3/9] wip --- .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 af8bd24..93122ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,7 +134,7 @@ jobs: - name: Build run: swift build -c ${{ matrix.config }} - name: Run tests (debug only) - run: swift test -windows-sdk-version 10.0.26100.0 + run: swift test -windows-sdk-version 10.0.22621.1778 # android: # name: Android From 45b75857cb59b8b22c91ac38e01023820d4f83c3 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Mon, 3 Mar 2025 14:26:27 -0800 Subject: [PATCH 4/9] wip --- .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 93122ad..7a2751e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: run: git config --system core.longpaths true - uses: actions/checkout@v4 - name: Build - run: swift build -c ${{ matrix.config }} + run: swift build -c ${{ matrix.config }} -windows-sdk-version 10.0.22621.1778 - name: Run tests (debug only) run: swift test -windows-sdk-version 10.0.22621.1778 From 9e928ea281f334302cf52d0a85a82c6a43fd91d8 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Mon, 3 Mar 2025 14:30:27 -0800 Subject: [PATCH 5/9] wip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a2751e..47a248a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,9 +132,9 @@ jobs: run: git config --system core.longpaths true - uses: actions/checkout@v4 - name: Build - run: swift build -c ${{ matrix.config }} -windows-sdk-version 10.0.22621.1778 + run: swift build -c ${{ matrix.config }} --windows-sdk-version 10.0.22621.1778 - name: Run tests (debug only) - run: swift test -windows-sdk-version 10.0.22621.1778 + run: swift test --windows-sdk-version 10.0.22621.1778 # android: # name: Android From ef61794876441747469ea677927dbb46e3864ca5 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Mon, 31 Mar 2025 09:46:21 -0700 Subject: [PATCH 6/9] wip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47a248a..7a2751e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,9 +132,9 @@ jobs: run: git config --system core.longpaths true - uses: actions/checkout@v4 - name: Build - run: swift build -c ${{ matrix.config }} --windows-sdk-version 10.0.22621.1778 + run: swift build -c ${{ matrix.config }} -windows-sdk-version 10.0.22621.1778 - name: Run tests (debug only) - run: swift test --windows-sdk-version 10.0.22621.1778 + run: swift test -windows-sdk-version 10.0.22621.1778 # android: # name: Android From 6acd7c61e17efb7ace3c5e90731aecbc7795bd25 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Wed, 2 Apr 2025 13:08:53 -0700 Subject: [PATCH 7/9] Update ci.yml --- .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 7a2751e..166544a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: run: git config --system core.longpaths true - uses: actions/checkout@v4 - name: Build - run: swift build -c ${{ matrix.config }} -windows-sdk-version 10.0.22621.1778 + run: swift -windows-sdk-version 10.0.22621.1778 build -c ${{ matrix.config }} - name: Run tests (debug only) run: swift test -windows-sdk-version 10.0.22621.1778 From 6b712ef06e858672e72b9c0b1ee080c34209bb41 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Wed, 2 Apr 2025 13:11:11 -0700 Subject: [PATCH 8/9] Update ci.yml --- .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 166544a..c05a01b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: run: git config --system core.longpaths true - uses: actions/checkout@v4 - name: Build - run: swift -windows-sdk-version 10.0.22621.1778 build -c ${{ matrix.config }} + run: swift build -windows-sdk-version 10.0.22621.1778 -c ${{ matrix.config }} - name: Run tests (debug only) run: swift test -windows-sdk-version 10.0.22621.1778 From d58cafeb2d7d69bb4196544b1801bc7915d5ad08 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Wed, 2 Apr 2025 13:17:19 -0700 Subject: [PATCH 9/9] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c05a01b..9ec3500 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,9 +132,9 @@ jobs: run: git config --system core.longpaths true - uses: actions/checkout@v4 - name: Build - run: swift build -windows-sdk-version 10.0.22621.1778 -c ${{ matrix.config }} + run: swift build -c ${{ matrix.config }} -Xswiftc -windows-sdk-version -Xswiftc 10.0.22621.1778 - name: Run tests (debug only) - run: swift test -windows-sdk-version 10.0.22621.1778 + run: swift test -Xswiftc -windows-sdk-version -Xswiftc 10.0.22621.1778 # android: # name: Android