From beac8244aea3692ade1f1b3ded02ef9fee382493 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 25 Nov 2025 15:27:36 -0700 Subject: [PATCH 1/3] Revert "build: use proper github token for docs publish" This reverts commit 09e7952600dd6fe091223915e9631d9113b78cc1. --- build/release/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/release/Makefile b/build/release/Makefile index b3e1f03e6..3409d1796 100644 --- a/build/release/Makefile +++ b/build/release/Makefile @@ -106,8 +106,6 @@ build.docs: deps.docs publish.docs: if ! git remote show docs > /dev/null 2>&1; then git remote add docs $(DOCS_GIT_REPO); fi git fetch -u docs gh-pages - # The default github token only has permissions to the rook repo, so use the token for the docs repo - export GITHUB_TOKEN="$(GIT_API_TOKEN)" # Switch to root of repo and then run the build and deploy of the documentation cd $(ROOT_DIR) && mike deploy --remote docs --push --branch gh-pages --update-aliases --deploy-prefix $(DOCS_PREFIX) $(DOCS_VERSION) $(DOCS_VERSION_ALIAS) From b0bd873abcc45ca6865571d871c41dd4bbde4be1 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 25 Nov 2025 15:29:46 -0700 Subject: [PATCH 2/3] build: revert update to latest checkout action The latest checkout v6 action is causing the docs publish to fail. Until we resolve the issue, revert back to v5. Signed-off-by: Travis Nielsen --- .github/workflows/push-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-build.yaml b/.github/workflows/push-build.yaml index 2f127a065..14e00a014 100644 --- a/.github/workflows/push-build.yaml +++ b/.github/workflows/push-build.yaml @@ -15,7 +15,7 @@ defaults: permissions: contents: read packages: write - id-token: write # for cosign OIDC keyless signing + id-token: write # for cosign OIDC keyless signing jobs: push-image-to-container-registry: @@ -23,7 +23,7 @@ jobs: if: github.repository == 'rook/rook' steps: - name: checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 From 9a23e7c91b8af272900e1b77b8a4801a74baade1 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 25 Nov 2025 15:30:32 -0700 Subject: [PATCH 3/3] Revert "build: fix docs publish from extraheader error" This reverts commit 4a03715386cfe82c3660b0852d17fece8dd72a8d. --- build/release/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/release/Makefile b/build/release/Makefile index 3409d1796..eb7e6b718 100644 --- a/build/release/Makefile +++ b/build/release/Makefile @@ -105,6 +105,8 @@ build.docs: deps.docs publish.docs: if ! git remote show docs > /dev/null 2>&1; then git remote add docs $(DOCS_GIT_REPO); fi + # If we are running in GitHub actions, remove the extraheader so our custom GitHub API token is used + if test "$$GITHUB_ACTIONS" = "true"; then git config --unset 'http.https://github.com/.extraheader'; fi git fetch -u docs gh-pages # Switch to root of repo and then run the build and deploy of the documentation cd $(ROOT_DIR) && mike deploy --remote docs --push --branch gh-pages --update-aliases --deploy-prefix $(DOCS_PREFIX) $(DOCS_VERSION) $(DOCS_VERSION_ALIAS)