From 95f1ae3405a8c1fb9e1d833e5a52f9275686624e Mon Sep 17 00:00:00 2001 From: Jacob Hearst Date: Mon, 26 Feb 2024 06:57:04 -0600 Subject: [PATCH 1/4] Use macOS 14 runner --- .github/workflows/publishDocs.yml | 4 ++-- Package@swift-5.7.swift | 23 ----------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 Package@swift-5.7.swift diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml index 41176f2..7b2d144 100644 --- a/.github/workflows/publishDocs.yml +++ b/.github/workflows/publishDocs.yml @@ -14,7 +14,7 @@ concurrency: jobs: build_docs: name: Build and Archive Docs - runs-on: macos-latest + runs-on: macos-14 steps: - name: Checkout uses: actions/checkout@v3 @@ -51,4 +51,4 @@ jobs: steps: - name: Deploy id: deployment - uses: actions/deploy-pages@v3 + uses: actions/deploy-pages@v4 \ No newline at end of file diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift deleted file mode 100644 index 1b7f183..0000000 --- a/Package@swift-5.7.swift +++ /dev/null @@ -1,23 +0,0 @@ -// swift-tools-version:5.7 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "ScryfallKit", - platforms: [.macOS(.v10_13), .iOS(.v12)], - products: [ - .library( - name: "ScryfallKit", - targets: ["ScryfallKit"]) - ], - dependencies: [ - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), - ], - targets: [ - .target(name: "ScryfallKit"), - .testTarget( - name: "ScryfallKitTests", - dependencies: ["ScryfallKit"]) - ] -) From ef672c4ed2600fe1dc0eda475a66489e4667a72e Mon Sep 17 00:00:00 2001 From: Jacob Hearst Date: Mon, 26 Feb 2024 06:57:52 -0600 Subject: [PATCH 2/4] Run publish on PRs to main --- .github/workflows/publishDocs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml index 7b2d144..8a3fa0c 100644 --- a/.github/workflows/publishDocs.yml +++ b/.github/workflows/publishDocs.yml @@ -3,8 +3,9 @@ name: Build and Publish Docs on: workflow_dispatch: push: - branches: - - 'main' + branches: [ main ] + pull_request: + branches: [ main ] # Kill any previous run still executing concurrency: From e80bd9691acd797348df86342cd018edd4ad6b2c Mon Sep 17 00:00:00 2001 From: Jacob Hearst Date: Mon, 26 Feb 2024 07:09:48 -0600 Subject: [PATCH 3/4] Add Package@swift-5.7 back --- Package@swift-5.7.swift | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Package@swift-5.7.swift diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift new file mode 100644 index 0000000..64717c7 --- /dev/null +++ b/Package@swift-5.7.swift @@ -0,0 +1,25 @@ +// swift-tools-version:5.7 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "ScryfallKit", + platforms: [.macOS(.v10_13), .iOS(.v12)], + products: [ + .library( + name: "ScryfallKit", + targets: ["ScryfallKit"]) + ], + dependencies: [ + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), + ], + targets: [ + .target( + name: "ScryfallKit" + ), + .testTarget( + name: "ScryfallKitTests", + dependencies: ["ScryfallKit"]) + ] +) From a7678da5f06168ef840fde62e816a8d76fd4ddfe Mon Sep 17 00:00:00 2001 From: Jacob Hearst Date: Mon, 26 Feb 2024 07:12:17 -0600 Subject: [PATCH 4/4] Don't run build+publish docs on PRs --- .github/workflows/publishDocs.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml index 8a3fa0c..1cf52ac 100644 --- a/.github/workflows/publishDocs.yml +++ b/.github/workflows/publishDocs.yml @@ -4,8 +4,6 @@ on: workflow_dispatch: push: branches: [ main ] - pull_request: - branches: [ main ] # Kill any previous run still executing concurrency: