diff --git a/.github/workflows/build-swiftusd.yml b/.github/workflows/build-swiftusd.yml index f46041aaa..e252326c5 100644 --- a/.github/workflows/build-swiftusd.yml +++ b/.github/workflows/build-swiftusd.yml @@ -33,13 +33,13 @@ on: openusd-ref: description: 'OpenUSD ref' - required: true + required: false type: string default: 'v25.08' build-targets: description: 'Build target list, or ALL' - required: true + required: false type: string default: 'ALL' diff --git a/.github/workflows/check-pull-requests-for-documentation-warnings.yml b/.github/workflows/check-pull-requests-for-documentation-warnings.yml index a998852e6..d80cdbbbb 100644 --- a/.github/workflows/check-pull-requests-for-documentation-warnings.yml +++ b/.github/workflows/check-pull-requests-for-documentation-warnings.yml @@ -25,6 +25,8 @@ permissions: on: pull_request jobs: Build-SwiftUsd: + permissions: + contents: write uses: ./.github/workflows/build-swiftusd.yml with: swiftusd-ref: ${{ github.ref }} @@ -36,12 +38,17 @@ jobs: - name: Download package artifact uses: actions/download-artifact@v5 with: - path: . - name: SwiftUsd-package-${{ github.run_id }} + path: SwiftUsd.tar.gz + name: SwiftUsd-package-${{ github.run_id }}.tar.gz + + - name: Untar package artifact + run: | + mkdir ./SwiftUsd + tar -xzf ./SwiftUsd.tar.gz/SwiftUsd.tar.gz -C ./SwiftUsd - name: Check for documentation warnings run: | - swift run --package-path ./scripts/docc build-documentation - swift run --package-path ./scripts/docc check-documentation + swift run --package-path ./SwiftUsd/scripts/docc build-documentation + swift run --package-path ./SwiftUsd/scripts/docc check-documentation \ No newline at end of file diff --git a/scripts/docc/Sources/SwiftUsdDoccUtil/FileSystemUtil.swift b/scripts/docc/Sources/SwiftUsdDoccUtil/FileSystemUtil.swift index b225b7f31..872631932 100644 --- a/scripts/docc/Sources/SwiftUsdDoccUtil/FileSystemUtil.swift +++ b/scripts/docc/Sources/SwiftUsdDoccUtil/FileSystemUtil.swift @@ -37,7 +37,6 @@ final public class Driver: Sendable { // Do a smoke test to make sure we have something that looks like the SwiftUsd repo let repoContents = try! FileManager.default.contentsOfDirectory(atPath: result.path(percentEncoded: false)) - assert(repoContents.contains("docs"), "Error! Could not find SwiftUsd repo URL") assert(repoContents.contains("openusd-patch.patch"), "Error! Could not find SwiftUsd repo URL") assert(repoContents.contains("Package.swift"), "Error! Could not find SwiftUsd repo URL") assert(repoContents.contains("README.md"), "Error! Could not find SwiftUsd repo URL") @@ -45,7 +44,6 @@ final public class Driver: Sendable { assert(repoContents.contains("source"), "Error! Could not find SwiftUsd repo URL") assert(repoContents.contains("swift-package"), "Error! Could not find SwiftUsd repo URL") assert(repoContents.contains("SwiftUsd.docc"), "Error! Could not find SwiftUsd repo URL") - assert(repoContents.contains("SwiftUsd.doccarchive"), "Error! Could not find SwiftUsd repo URL") return result }