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 diff --git a/build/release/Makefile b/build/release/Makefile index b3e1f03e6..eb7e6b718 100644 --- a/build/release/Makefile +++ b/build/release/Makefile @@ -105,9 +105,9 @@ 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 - # 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)