diff --git a/.github/workflows/release-pr.yaml b/.github/workflows/release-pr.yaml index 64bd59463ea..3332ff85e4f 100644 --- a/.github/workflows/release-pr.yaml +++ b/.github/workflows/release-pr.yaml @@ -41,6 +41,7 @@ jobs: echo "NEWVERSION=v${MAJOR_VERSION}.$((MINOR_VERSION+1)).0-beta.0" >> ${GITHUB_ENV} # pre-release is always being merged to the master branch echo "TARGET_BRANCH=master" >> ${GITHUB_ENV} + echo "TAG=${TAG}" >> ${GITHUB_ENV} - name: Set release version and target branch from input if: github.event_name == 'workflow_dispatch' @@ -49,6 +50,7 @@ jobs: echo "${NEWVERSION}" | grep -E '^v[0-9]+\.[0-9]+\.[0-9](-(beta|rc)\.[0-9]+)?$' || (echo "release_version should be in the format vX.Y.Z, vX.Y.Z-beta.A, or vX.Y.Z-rc.B" && exit 1) echo "NEWVERSION=${NEWVERSION}" >> ${GITHUB_ENV} + echo "TAG=${NEWVERSION}" >> ${GITHUB_ENV} MAJOR_VERSION="$(echo "${NEWVERSION}" | cut -d '.' -f1 | tr -d 'v')" MINOR_VERSION="$(echo "${NEWVERSION}" | cut -d '.' -f2)" @@ -75,7 +77,7 @@ jobs: - run: make release-manifest promote-staging-manifest - if: github.event_name == 'push' - run: make version-docs NEWVERSION=v${MAJOR_VERSION}.${MINOR_VERSION}.x + run: make version-docs NEWVERSION=v${MAJOR_VERSION}.${MINOR_VERSION}.x TAG=${TAG} - name: Create release pull request uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2 diff --git a/Makefile b/Makefile index 2daf6c0c0d1..56fbb5b3d7d 100644 --- a/Makefile +++ b/Makefile @@ -462,7 +462,6 @@ release-manifest: @sed -i "s/tag: $(VERSION)/tag: ${NEWVERSION}/" ./cmd/build/helmify/static/values.yaml @sed -i 's/Current release version: `$(VERSION)`/Current release version: `'"${NEWVERSION}"'`/' ./cmd/build/helmify/static/README.md @sed -i -e 's/^VERSION := $(VERSION)/VERSION := ${NEWVERSION}/' ./Makefile - @sed -i 's/https:\/\/raw\.githubusercontent\.com\/open-policy-agent\/gatekeeper\/master\/deploy\/gatekeeper\.yaml.*/https:\/\/raw\.githubusercontent\.com\/open-policy-agent\/gatekeeper\/${NEWVERSION}\/deploy\/gatekeeper\.yaml/' ./website/docs/install.md export $(MAKE) manifests @@ -475,6 +474,7 @@ version-docs: -u $(shell id -u):$(shell id -g) \ node:${NODE_VERSION} \ sh -c "yarn install --frozen-lockfile && yarn run docusaurus docs:version ${NEWVERSION}" + @sed -i 's/https:\/\/raw\.githubusercontent\.com\/open-policy-agent\/gatekeeper\/master\/deploy\/gatekeeper\.yaml.*/https:\/\/raw\.githubusercontent\.com\/open-policy-agent\/gatekeeper\/${TAG}\/deploy\/gatekeeper\.yaml/' ./website/versioned_docs/version-${NEWVERSION}/install.md promote-staging-manifest: @rm -rf deploy