From 83b1ce13c88b5d7568c2b712b413e8aed1c03a1c Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 4 Nov 2023 20:05:24 -0500 Subject: [PATCH 1/2] remove testing for swift prior to 5.8 --- .github/workflows/codecov.yml | 2 +- .github/workflows/tests.yml | 60 ++--------------------------------- 2 files changed, 3 insertions(+), 59 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 668c51c80..0d392008d 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: codecov: container: - image: swift:5.7 + image: swift:5.8 runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 442b5d5ee..13cbf756b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,62 +13,6 @@ jobs: fail-fast: false matrix: image: - - swift:5.1-xenial - - swift:5.1-bionic - - swift:5.2-xenial - - swift:5.2-bionic - - swift:5.2-focal - - swift:5.2-centos8 - - swift:5.2-amazonlinux2 - - swift:5.3-xenial - - swift:5.3-bionic - - swift:5.3-focal - - swift:5.3-centos8 - - swift:5.3-amazonlinux2 - # see below for 5.4, 5.5, etc. - container: ${{ matrix.image }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Run tests - run: swift test --enable-test-discovery - # 5.4 is separate because there was a bug in the compiler that caused - # us to need to run swift tets with the -sil-verify-none flag. - linux-5_4: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - image: - - swift:5.4-xenial - - swift:5.4-bionic - - swift:5.4-focal - - swift:5.4-centos8 - - swift:5.4-amazonlinux2 - container: ${{ matrix.image }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Run tests (without test discovery flag) - run: swift test -Xswiftc -Xfrontend -Xswiftc -sil-verify-none - linux-5_5-plus: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - image: - - swift:5.5-xenial - - swift:5.5-bionic - - swift:5.5-focal - - swift:5.5-centos8 - - swift:5.5-amazonlinux2 - - swift:5.6-bionic - - swift:5.6-focal - - swift:5.6-amazonlinux2 - - swift:5.7-bionic - - swift:5.7-focal - - swift:5.7-jammy - - swift:5.7-amazonlinux2 - swift:5.8-bionic - swift:5.8-focal - swift:5.8-jammy @@ -87,7 +31,7 @@ jobs: - name: Run tests run: swift test osx: - runs-on: macOS-12 + runs-on: macOS-13 steps: - name: Select latest available Xcode uses: maxim-lobanov/setup-xcode@v1 @@ -96,4 +40,4 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - name: Run tests - run: swift test --enable-test-discovery + run: swift test From 84584677639bfb8d0c815286e5ff8eaa8ac63ce1 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 4 Nov 2023 20:12:26 -0500 Subject: [PATCH 2/2] update the Package manifest --- Package.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 9da86ea46..bb7163de1 100644 --- a/Package.swift +++ b/Package.swift @@ -1,11 +1,11 @@ -// swift-tools-version:5.1 +// swift-tools-version: 5.8 import PackageDescription let package = Package( name: "OpenAPIKit", platforms: [ - .macOS(.v10_10), + .macOS(.v10_13), .iOS(.v11) ], products: [ @@ -25,7 +25,8 @@ let package = Package( targets: [ .target( name: "OpenAPIKitCore", - dependencies: []), + dependencies: [], + exclude: ["AnyCodable/README.md"]), .testTarget( name: "OpenAPIKitCoreTests", dependencies: ["OpenAPIKitCore"]),