From 04ddb57233b5f7f31bb0ccd32a04b8fd5f2aa2da Mon Sep 17 00:00:00 2001 From: Jubilee <46493976+workingjubilee@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:29:11 -0700 Subject: [PATCH] Correct release instructions for current repo tools (#1808) - Remove a reference to a script that doesn't exist anymore. - Remind people to pull off develop so they publish the same commit. - Add cargo commands that are required for actual releases. --- docs/src/contributing/release.md | 7 ++----- prepare-release.sh | 5 ++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/contributing/release.md b/docs/src/contributing/release.md index a373c7057..10bb9f777 100644 --- a/docs/src/contributing/release.md +++ b/docs/src/contributing/release.md @@ -8,13 +8,10 @@ - edit them as best as you can while channeling @workingjubilee's spirit - request a review - do a squash merge into develop - -```shell -./finalize-release.sh -``` - - create the actual release on GitHub, tagging the `develop` branch with "${NEW_VERSION}", using the release notes you made in your PR ```shell +git switch develop +git pull origin/develop ./publish.sh ``` diff --git a/prepare-release.sh b/prepare-release.sh index d25ee6374..ff62d04b8 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -25,7 +25,10 @@ elif [ "$NEW_VERSION" = "" ]; then else git pull origin develop --ff-only git switch -c "prepare-${NEW_VERSION}" - + + cargo install --path cargo-pgrx --locked + cargo pgrx init + # exit early if the script fails ./update-versions.sh "${NEW_VERSION}" || exit $?