diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82956c0..f831bcd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,10 +4,10 @@ on: push: branches: [ "main" ] pull_request: - types: [opened, reopened] + types: [opened, reopened, synchronize] jobs: - test: + test-16-2: runs-on: macos-latest steps: - name: Set Xcode version @@ -16,12 +16,20 @@ jobs: - name: Run tests run: swift test -v - test-linux: - if: false - runs-on: ubuntu-22.04 + test-26: + runs-on: macos-26 + steps: + - name: Set Xcode version + run: sudo xcode-select -s /Applications/Xcode_26.0.app + - uses: actions/checkout@v3 + - name: Run tests + run: swift test -v + + test-linux-6-1: + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: swift-actions/setup-swift@v2 + - uses: SwiftyLab/setup-swift@latest with: swift-version: "6.1.0" - name: Get swift version @@ -30,3 +38,17 @@ jobs: run: git config --global user.email "test@example.com" && git config --global user.name "Test User" - name: Run tests run: swift test -v + + test-linux-6-2: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: SwiftyLab/setup-swift@latest + with: + swift-version: "6.2.0" + - name: Get swift version + run: swift --version + - name: Prepare Git + run: git config --global user.email "test@example.com" && git config --global user.name "Test User" + - name: Run tests + run: swift test -v diff --git a/Package.swift b/Package.swift index 2f3f80b..397262d 100644 --- a/Package.swift +++ b/Package.swift @@ -33,11 +33,11 @@ let targets: [PackageDescription.Target] = [ "PathKit", "Yams", .product(name: "ArgumentParser", package: "swift-argument-parser")], - swiftSettings: flags, + swiftSettings: flags ), .target(name: "DependencyCalculator", dependencies: ["Workspace", "PathKit", "Git", .product(name: "Logging", package: "swift-log")], - swiftSettings: flags, + swiftSettings: flags ), .target(name: "TestConfigurator", dependencies: [ @@ -46,18 +46,18 @@ let targets: [PackageDescription.Target] = [ .product(name: "Logging", package: "swift-log"), .product(name: "ArgumentParser", package: "swift-argument-parser") ], - swiftSettings: flags, + swiftSettings: flags ), .target(name: "Workspace", dependencies: ["XcodeProj", .product(name: "Logging", package: "swift-log")], - swiftSettings: flags, + swiftSettings: flags ), .target(name: "Git", dependencies: ["SelectiveTestShell", "PathKit", .product(name: "Logging", package: "swift-log")], - swiftSettings: flags, + swiftSettings: flags ), .target(name: "SelectiveTestShell", - swiftSettings: flags, + swiftSettings: flags ), .testTarget( name: "SelectiveTestingTests", @@ -83,7 +83,7 @@ let targets: [PackageDescription.Target] = [ ] ), dependencies: ["xcode-selective-test"] - ), + ) ] let package = Package(