From abe4fcc7fe3d5e91721c9ab9f7d4820fa21d8f43 Mon Sep 17 00:00:00 2001 From: Jerrod Putman Date: Sun, 9 Jul 2023 16:45:29 -0700 Subject: [PATCH] Adds GitHub Action for Linux tests --- .github/workflows/RunTests-macOS.yml | 18 ++++++++++++------ Package.swift | 4 ++-- Tests/LinuxMain.swift | 8 -------- Tests/SwiftNESTests/XCTestManifests.swift | 10 ---------- 4 files changed, 14 insertions(+), 26 deletions(-) delete mode 100644 Tests/LinuxMain.swift delete mode 100644 Tests/SwiftNESTests/XCTestManifests.swift diff --git a/.github/workflows/RunTests-macOS.yml b/.github/workflows/RunTests-macOS.yml index cb2c0be..b86c696 100644 --- a/.github/workflows/RunTests-macOS.yml +++ b/.github/workflows/RunTests-macOS.yml @@ -4,12 +4,18 @@ on: [pull_request] jobs: build: - - runs-on: macos-13 - + name: Swift ${{ matrix.swift }} on ${{ matrix.os }} + strategy: + matrix: + os: [macos-13, ubuntu-latest] + swift: ["5.8"] + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 - - name: Select Xcode 15 beta - run: sudo xcode-select -s /Applications/Xcode_15.0.app + - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf + with: + swift-version: ${{ matrix.swift }} + - uses: actions/checkout@v3 + - name: Build + run: swift build - name: Run tests run: swift test diff --git a/Package.swift b/Package.swift index cdd1318..a6999e1 100644 --- a/Package.swift +++ b/Package.swift @@ -1,10 +1,10 @@ -// swift-tools-version:5.9 +// swift-tools-version:5.8 import PackageDescription let package = Package( name: "SwiftNES", - platforms: [.macOS(.v13), .iOS(.v17), .tvOS(.v17)], + platforms: [.macOS(.v13), .iOS(.v16), .tvOS(.v16)], products: [ .library( name: "SwiftNES", diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift deleted file mode 100644 index cbb9a7c..0000000 --- a/Tests/LinuxMain.swift +++ /dev/null @@ -1,8 +0,0 @@ -import XCTest - -import SwiftNESTests - -var tests = [XCTestCaseEntry]() -tests += SwiftNESTests.allTests() -tests += BusTests.allTests() -XCTMain(tests) diff --git a/Tests/SwiftNESTests/XCTestManifests.swift b/Tests/SwiftNESTests/XCTestManifests.swift deleted file mode 100644 index 88e3c12..0000000 --- a/Tests/SwiftNESTests/XCTestManifests.swift +++ /dev/null @@ -1,10 +0,0 @@ -import XCTest - -#if !canImport(ObjectiveC) -public func allTests() -> [XCTestCaseEntry] { - return [ - testCase(SwiftNESTests.allTests), - testCase(BusTests.allTests), - ] -} -#endif