From 6d0fae15f9ed229aa01f23ddeded7f0ef4e04feb Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Tue, 30 Apr 2024 13:19:51 +0400 Subject: [PATCH] Update `DocC Plugin` --- .github/actions/publish_pages/action.yml | 10 +++++----- .github/workflows/publish-pages.yml | 18 +++++++++++++----- Package.swift | 2 +- Package@swift-5.7.swift | 2 +- Package@swift-5.8.swift | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/actions/publish_pages/action.yml b/.github/actions/publish_pages/action.yml index 52291c8c3..a96a3b21e 100644 --- a/.github/actions/publish_pages/action.yml +++ b/.github/actions/publish_pages/action.yml @@ -24,11 +24,11 @@ runs: --transform-for-static-hosting \ --hosting-base-path ${{ inputs.base_path }}; + - name: Setup Pages + id: pages + uses: actions/configure-pages@v3 + - name: Upload artifact uses: actions/upload-artifact@v4 with: - path: docs - - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v1 \ No newline at end of file + path: docs \ No newline at end of file diff --git a/.github/workflows/publish-pages.yml b/.github/workflows/publish-pages.yml index 57831539c..1d424dd2d 100644 --- a/.github/workflows/publish-pages.yml +++ b/.github/workflows/publish-pages.yml @@ -20,10 +20,7 @@ concurrency: cancel-in-progress: true jobs: - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} + build: runs-on: macos-12 strategy: fail-fast: false @@ -40,4 +37,15 @@ jobs: uses: ./.github/actions/publish_pages with: target: ${{ matrix.target }} - base_path: ${{ matrix.base_path }} \ No newline at end of file + base_path: ${{ matrix.base_path }} + + deploy: + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }}% \ No newline at end of file diff --git a/Package.swift b/Package.swift index 66e7786f8..4e637807f 100644 --- a/Package.swift +++ b/Package.swift @@ -22,7 +22,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/space-code/concurrency.git", .upToNextMajor(from: "0.0.1")), - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.1.0"), + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"), .package(url: "https://github.com/space-code/log.git", .upToNextMajor(from: "1.1.0")), .package(url: "https://github.com/space-code/atomic.git", .upToNextMajor(from: "1.0.0")), .package( diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift index d490e62d7..045522079 100644 --- a/Package@swift-5.7.swift +++ b/Package@swift-5.7.swift @@ -19,7 +19,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/space-code/concurrency.git", .upToNextMajor(from: "0.0.1")), - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.1.0"), + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"), .package(url: "https://github.com/space-code/log.git", .upToNextMajor(from: "1.1.0")), .package(url: "https://github.com/space-code/atomic.git", .upToNextMajor(from: "1.0.0")), .package( diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift index 7174b9d90..adca19830 100644 --- a/Package@swift-5.8.swift +++ b/Package@swift-5.8.swift @@ -19,7 +19,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/space-code/concurrency.git", .upToNextMajor(from: "0.0.1")), - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.1.0"), + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"), .package(url: "https://github.com/space-code/log.git", .upToNextMajor(from: "1.1.0")), .package(url: "https://github.com/space-code/atomic.git", .upToNextMajor(from: "1.0.0")), .package(