Update CI environment (#321)

* Update CI environment

* Add linker helper

* Add more search path

Author: sidepelican

.github/workflows/builds.yml

@@ -8,22 +8,34 @@ on:
 
 jobs:
   run:
-    name: Test on ${{ matrix.os }} with swift${{ matrix.swift }}
+    name: Test on ${{ matrix.os }} - ${{ matrix.version }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest]
-        swift: ["5.10", "6.0", "6.1"]
+        include:
+          - os: ubuntu-latest
+            version: "5.10"
+          - os: ubuntu-latest
+            version: "6.0"
+          - os: ubuntu-latest
+            version: "6.1"
+          - os: ubuntu-latest
+            version: "6.2"
+          - os: macos-latest
+            version: "16.2" # Swift 6.0
+          - os: macos-latest
+            version: "16.4" # Swift 6.1
+          - os: macos-latest
+            version: "26.1" # Swift 6.2
     steps:
       - if: startsWith(matrix.os, 'ubuntu')
         uses: vapor/swiftly-action@v0.2
         with:
-          toolchain: ${{ matrix.swift }}
+          toolchain: ${{ matrix.version }}
       - if: startsWith(matrix.os, 'macos')
-        uses: swift-actions/setup-swift@v2
-        with:
-          swift-version: ${{ matrix.swift }}
+        name: Select Xcode
+        run: sudo xcode-select -s "/Applications/Xcode_${{ matrix.version }}.app"
 
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -5,9 +5,6 @@ on:
   release:
     types: [published]
 
-env:
-  SWIFT_VERSION: "6.1.0"
-
 jobs:
   build:
     name: Build for ${{ matrix.destination.name }}
@@ -22,9 +19,9 @@ jobs:
     - if: startsWith(matrix.destination.name, 'ubuntu')
       uses: vapor/swiftly-action@v0.2
       with:
-        toolchain: ${{ env.SWIFT_VERSION }}
+        toolchain: "6.2"
     - if: startsWith(matrix.destination.name, 'macos')
-      run: sudo xcode-select -s /Applications/Xcode_16.3.app
+      run: sudo xcode-select -s /Applications/Xcode_26.1.app
 
     - uses: actions/checkout@v4
     - name: Create the binary
@@ -47,9 +44,9 @@ jobs:
           - { name: "ubuntu-x86_64", os: ubuntu-22.04 }
           - { name: "ubuntu-aarch64", os: ubuntu-24.04-arm }
           - { name: "ubuntu-aarch64", os: ubuntu-22.04-arm }
+          - { name: "macos-universal", os: macos-26 }
           - { name: "macos-universal", os: macos-15 }
           - { name: "macos-universal", os: macos-14 }
-          - { name: "macos-universal", os: macos-13 }
     steps:
     - uses: actions/download-artifact@v4
       with:
@@ -77,7 +74,7 @@ jobs:
         with:
           name: mockolo.artifactbundle.zip
           path: mockolo.artifactbundle.zip
-      
+
       - name: Compute checksum
         id: checksum
         run: echo "checksum=$(swift package compute-checksum mockolo.artifactbundle.zip)" >> "$GITHUB_OUTPUT"

install-script.sh

@@ -65,7 +65,9 @@ echo "OUTPUT FILE = ${OUTFILE}"
 cd "$SRCDIR"
 rm -rf .build
 case $(uname -s) in
-    Linux*)     swift build -c release
+    Linux*)     swift build -c release \
+                    -Xlinker -rpath -Xlinker /usr/lib/swift/linux \
+                    -Xlinker -rpath -Xlinker /usr/share/swift/usr/lib/swift/linux
                 cd .build/release;;
     Darwin*)    swift build -c release --arch arm64 --arch x86_64
                 cd .build/apple/Products/Release;;