From 88f5a649eaa0a10d5056c592a9cbd2b75fa8463b Mon Sep 17 00:00:00 2001 From: Maddy Adams Date: Mon, 26 Jan 2026 09:52:08 -0800 Subject: [PATCH 1/5] Change build-swiftusd.inputs.openusd-ref, build-targets to required: false since they have defaults --- .github/workflows/build-swiftusd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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' From a44b3031fc3288a87f9236c4611ff85484de1aaf Mon Sep 17 00:00:00 2001 From: Maddy Adams Date: Mon, 26 Jan 2026 09:57:24 -0800 Subject: [PATCH 2/5] Add permissions: contents: write to check-pull-requests-for-documentation-warning's use of build-swiftusd --- .../check-pull-requests-for-documentation-warnings.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/check-pull-requests-for-documentation-warnings.yml b/.github/workflows/check-pull-requests-for-documentation-warnings.yml index a998852e6..038ae5598 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 }} From ffdda4bf811cb20c4f287b62cfcacb87967ed372 Mon Sep 17 00:00:00 2001 From: Maddy Adams Date: Mon, 26 Jan 2026 10:43:16 -0800 Subject: [PATCH 3/5] Add untar step to check-pull-requests-for-documentation-warnings --- ...eck-pull-requests-for-documentation-warnings.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-pull-requests-for-documentation-warnings.yml b/.github/workflows/check-pull-requests-for-documentation-warnings.yml index 038ae5598..dc87a18da 100644 --- a/.github/workflows/check-pull-requests-for-documentation-warnings.yml +++ b/.github/workflows/check-pull-requests-for-documentation-warnings.yml @@ -38,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 From 7cf58a2dbc39d450ce7296af87f2561d22147aff Mon Sep 17 00:00:00 2001 From: Maddy Adams Date: Mon, 26 Jan 2026 10:44:15 -0800 Subject: [PATCH 4/5] Fix workflow typo --- .../check-pull-requests-for-documentation-warnings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-pull-requests-for-documentation-warnings.yml b/.github/workflows/check-pull-requests-for-documentation-warnings.yml index dc87a18da..d80cdbbbb 100644 --- a/.github/workflows/check-pull-requests-for-documentation-warnings.yml +++ b/.github/workflows/check-pull-requests-for-documentation-warnings.yml @@ -43,8 +43,8 @@ jobs: - name: Untar package artifact run: | - mkdir ./SwiftUsd - tar -xzf ./SwiftUsd.tar.gz/SwiftUsd.tar.gz -C ./SwiftUsd + mkdir ./SwiftUsd + tar -xzf ./SwiftUsd.tar.gz/SwiftUsd.tar.gz -C ./SwiftUsd - name: Check for documentation warnings run: | From 77185beeb6495774b8b10ad610acc451033f0a12 Mon Sep 17 00:00:00 2001 From: Maddy Adams Date: Mon, 26 Jan 2026 11:02:49 -0800 Subject: [PATCH 5/5] Relax required files for docc script detection of the SwiftUsd repo root --- scripts/docc/Sources/SwiftUsdDoccUtil/FileSystemUtil.swift | 2 -- 1 file changed, 2 deletions(-) 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 }