From a99e326f2a5c06dd53e2afd6a623161fbd8974a8 Mon Sep 17 00:00:00 2001 From: Daniel Sincere Date: Fri, 28 Feb 2025 12:37:37 -0500 Subject: [PATCH 1/5] upload binary --- .github/workflows/ci.yml | 45 ++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3c167b..fc4cbaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,19 +15,18 @@ jobs: include: - os: macos-13 swift: "5.9" + - os: macos-14 + swift: "5.9" + - os: macos-15 + swift: "5.9" - os: ubuntu-latest swift: "5.9" steps: - - uses: swift-actions/setup-swift@v1 + - uses: SwiftyLab/setup-swift@latest with: swift-version: ${{ matrix.swift }} - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: latest-stable - if: matrix.os != 'ubuntu-latest' - - uses: actions/checkout@v3 - name: "swift test" @@ -36,17 +35,27 @@ jobs: - name: build run: swift build -c release + - name: set binary path + id: binary-path + run: echo "binary-path=$(swift build --show-bin-path -c release)/SPX" >> "$GITHUB_OUTPUT" + + - name: upload binary + uses: actions/upload-artifact@v4 + with: + name: SPX.${{ matrix.os}} + path: ${{ steps.binary-path.outputs.binary-path }} + - name: "test: version" - run: $(swift build -c release --show-bin-path)/spx --version + run: ${{ steps.binary-path.outputs.binary-path }} --version - name: "test: help" - run: $(swift build -c release --show-bin-path)/spx --help + run: ${{ steps.binary-path.outputs.binary-path }} --help - name: "test: init" - run: $(swift build -c release --show-bin-path)/spx --init simple + run: ${{ steps.binary-path.outputs.binary-path }} --init simple - name: "test: add" - run: $(swift build -c release --show-bin-path)/spx --add date2 + run: ${{ steps.binary-path.outputs.binary-path }} --add date2 - uses: actions/upload-artifact@v3 with: @@ -54,24 +63,24 @@ jobs: path: SPX - name: "test: run" - run: $(swift build -c release --show-bin-path)/spx date2 + run: ${{ steps.binary-path.outputs.binary-path }} date2 - name: "test: build" - run: $(swift build -c release --show-bin-path)/spx --build + run: ${{ steps.binary-path.outputs.binary-path }} --build - name: "reset spx dir" run: rm -fr SPX - name: "template ios - scaffold" - run: $(swift build -c release --show-bin-path)/spx -i ios + run: ${{ steps.binary-path.outputs.binary-path }} -i ios - name: "template ios - build" - run: $(swift build -c release --show-bin-path)/spx --build - if: ${{ matrix.os == 'macos-13' }} + run: ${{ steps.binary-path.outputs.binary-path }} --build + if: ${{ matrix.os != 'ubuntu-latest' }} - name: "template ios - generate app icon" - run: $(swift build -c release --show-bin-path)/spx appicon - if: ${{ matrix.os == 'macos-13' }} + run: ${{ steps.binary-path.outputs.binary-path }} appicon + if: ${{ matrix.os != 'ubuntu-latest' }} - uses: actions/upload-artifact@v3 with: @@ -82,7 +91,7 @@ jobs: - name: "demo: build container" run: cd demos/VaporDemo && $(swift build -c release --package-path ../.. --show-bin-path)/spx docker - if: ${{ matrix.os != 'macos-13' }} + if: ${{ matrix.os == 'ubuntu-latest' }} - name: "demo: update and test" run: cd demos/VaporDemo && $(swift build -c release --package-path ../.. --show-bin-path)/spx UpdateAndTest From 6c7c6391ec6c1b9969ac9b8049c6a37f0f1298c3 Mon Sep 17 00:00:00 2001 From: Daniel Sincere Date: Fri, 28 Feb 2025 12:47:24 -0500 Subject: [PATCH 2/5] artifact upload version --- .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 fc4cbaa..58172fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: - name: "test: add" run: ${{ steps.binary-path.outputs.binary-path }} --add date2 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: spx-init-${{ matrix.swift }}-${{ matrix.os }} path: SPX @@ -82,7 +82,7 @@ jobs: run: ${{ steps.binary-path.outputs.binary-path }} appicon if: ${{ matrix.os != 'ubuntu-latest' }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: spx-ios-${{ matrix.swift }}-${{ matrix.os }} path: | From f4aa74642b5001cc39fb14fb955f0317f126a11a Mon Sep 17 00:00:00 2001 From: Daniel Sincere Date: Fri, 28 Feb 2025 13:01:13 -0500 Subject: [PATCH 3/5] swift 6 --- .github/workflows/ci.yml | 8 ++++---- Package.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58172fa..59fcf56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,13 +14,13 @@ jobs: matrix: include: - os: macos-13 - swift: "5.9" + swift: "6.0" - os: macos-14 - swift: "5.9" + swift: "6.0" - os: macos-15 - swift: "5.9" + swift: "6.0" - os: ubuntu-latest - swift: "5.9" + swift: "6.0" steps: - uses: SwiftyLab/setup-swift@latest diff --git a/Package.swift b/Package.swift index 4a5a655..21d582a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.9 +// swift-tools-version: 6.0 import PackageDescription From e559b42b3f8bc0c2e816efa183538c01d8f95b59 Mon Sep 17 00:00:00 2001 From: Daniel Sincere Date: Fri, 28 Feb 2025 13:12:11 -0500 Subject: [PATCH 4/5] casing --- .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 59fcf56..a97b4db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,12 +37,12 @@ jobs: - name: set binary path id: binary-path - run: echo "binary-path=$(swift build --show-bin-path -c release)/SPX" >> "$GITHUB_OUTPUT" + run: echo "binary-path=$(swift build --show-bin-path -c release)/spx" >> "$GITHUB_OUTPUT" - name: upload binary uses: actions/upload-artifact@v4 with: - name: SPX.${{ matrix.os}} + name: spx.${{ matrix.os}} path: ${{ steps.binary-path.outputs.binary-path }} - name: "test: version" From 23f6b3377c56f09af152ce545b9b7e9b056f5015 Mon Sep 17 00:00:00 2001 From: Daniel Sincere Date: Sat, 1 Mar 2025 20:45:42 -0500 Subject: [PATCH 5/5] version bump --- Sources/SPXLib/version.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/SPXLib/version.swift b/Sources/SPXLib/version.swift index bed1129..21b131b 100644 --- a/Sources/SPXLib/version.swift +++ b/Sources/SPXLib/version.swift @@ -1 +1 @@ -let version = "1.2.0" +let version = "1.3.0"