diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 9c9a182a..e78724aa 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -25,23 +25,31 @@ jobs: version: "6.1" - os: ubuntu-latest version: "6.2" + - os: ubuntu-latest + version: "6.3" + - os: ubuntu-latest + version: "6.4" - os: macos-15 version: "16.2" # Swift 6.0 - os: macos-15 version: "16.4" # Swift 6.1 - - os: macos-latest + - os: macos-26 version: "26.1" # Swift 6.2 + - os: macos-26 + version: "26.4" # Swift 6.3 + - os: xcode-27 + version: "27" # Swift 6.4 steps: - if: startsWith(matrix.os, 'ubuntu') uses: vapor/swiftly-action@v0.2 with: toolchain: ${{ matrix.version }} - - if: startsWith(matrix.os, 'macos') + - if: runner.os == 'macOS' name: Select Xcode run: sudo xcode-select -s "/Applications/Xcode_${{ matrix.version }}.app" - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Build and Test run: swift test env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ec5083b..c5b81c31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - if: startsWith(matrix.destination.name, 'macos') run: sudo xcode-select -s /Applications/Xcode_26.3.app - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Update Version.swift run: echo "let version = \"${{ inputs.version }}\"" > Sources/Mockolo/Version.swift - name: Create the binary @@ -80,7 +80,7 @@ jobs: outputs: checksum: ${{ steps.checksum.outputs.checksum }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Download all artifacts uses: actions/download-artifact@v8 with: @@ -121,7 +121,7 @@ jobs: mockolo.artifactbundle.zip - name: Publish to GitHub Releases - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v3 with: name: ${{ inputs.version }} tag_name: ${{ inputs.version }} diff --git a/install-script.sh b/install-script.sh index 5debf37f..89396f03 100755 --- a/install-script.sh +++ b/install-script.sh @@ -65,9 +65,7 @@ echo "OUTPUT FILE = ${OUTFILE}" cd "$SRCDIR" rm -rf .build case $(uname -s) in - Linux*) swift build -c release \ - -Xlinker -rpath -Xlinker /usr/lib/swift/linux \ - -Xlinker -rpath -Xlinker /usr/share/swift/usr/lib/swift/linux + Linux*) swift build -c release --static-swift-stdlib cd .build/release;; Darwin*) swift build -c release --arch arm64 --arch x86_64 cd .build/apple/Products/Release;;