From d006411178b026a0395c0f978158950da6d1aa1f Mon Sep 17 00:00:00 2001 From: M Bernt Date: Fri, 28 Jun 2024 10:28:19 +0200 Subject: [PATCH 1/3] Minor additions to release process --- doc/source/dev/create_release.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/source/dev/create_release.rst b/doc/source/dev/create_release.rst index 75d1ff7d469d..c97617495781 100644 --- a/doc/source/dev/create_release.rst +++ b/doc/source/dev/create_release.rst @@ -36,11 +36,12 @@ and that you have configured your remotes so that you can push to the configured The script should abort gracefully if that is not the case. Follow these steps: + 0. Enable the push URL of the galaxyproject remote if you have disable it and disable pre-commit hooks 1. Check out the branch from which you want to create a release, e.g. release_23.0: `git checkout release_23.0` 2. Activate your local virtualenv with Galaxy's dev requirements: `. .venv/bin/activate` 3. Update Galaxy's dev dependencies (if you haven't done this in a while): `pip install -r lib/galaxy/dependencies/dev-requirements.txt` 4. You need a personal access token from github (only needs public read permissions). - 5. `GITHUB_AUTH=$YOUR_PAT_FROM_STEP_3 galaxy-release-util create-release --new-version 23.0.1 --last-commit v23.0` + 5. `GITHUB_AUTH=$YOUR_PAT_FROM_STEP_4 galaxy-release-util create-release --new-version 23.0.1 --last-commit v23.0` 6. Follow along the prompts and make sure the proposed changes look correct When the script is finished you should find a new tag in the GitHub interface, as well as updated release and dev branches. From df044c4fff111af40a1830a161df2e21d74b5720 Mon Sep 17 00:00:00 2001 From: M Bernt Date: Fri, 28 Jun 2024 11:33:49 +0200 Subject: [PATCH 2/3] Update doc/source/dev/create_release.rst Co-authored-by: Martin Cech --- doc/source/dev/create_release.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/dev/create_release.rst b/doc/source/dev/create_release.rst index c97617495781..2d108734eada 100644 --- a/doc/source/dev/create_release.rst +++ b/doc/source/dev/create_release.rst @@ -36,7 +36,7 @@ and that you have configured your remotes so that you can push to the configured The script should abort gracefully if that is not the case. Follow these steps: - 0. Enable the push URL of the galaxyproject remote if you have disable it and disable pre-commit hooks + 0. Enable the push URL of the galaxyproject remote if you have disabled it and disable pre-commit hooks 1. Check out the branch from which you want to create a release, e.g. release_23.0: `git checkout release_23.0` 2. Activate your local virtualenv with Galaxy's dev requirements: `. .venv/bin/activate` 3. Update Galaxy's dev dependencies (if you haven't done this in a while): `pip install -r lib/galaxy/dependencies/dev-requirements.txt` From 7721bf377f49619e6e1b61dd42f2833a44acca17 Mon Sep 17 00:00:00 2001 From: John Davis Date: Fri, 28 Jun 2024 11:42:01 +0200 Subject: [PATCH 3/3] Update doc/source/dev/create_release.rst --- doc/source/dev/create_release.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/dev/create_release.rst b/doc/source/dev/create_release.rst index 2d108734eada..22f4783be918 100644 --- a/doc/source/dev/create_release.rst +++ b/doc/source/dev/create_release.rst @@ -36,7 +36,7 @@ and that you have configured your remotes so that you can push to the configured The script should abort gracefully if that is not the case. Follow these steps: - 0. Enable the push URL of the galaxyproject remote if you have disabled it and disable pre-commit hooks + 0. Enable the push URL of the galaxyproject git remote if you have disabled it (e.g. `git remote set-url --push upstream git@github.com:galaxyproject/galaxy.git`) and disable any pre-commit hooks you might have 1. Check out the branch from which you want to create a release, e.g. release_23.0: `git checkout release_23.0` 2. Activate your local virtualenv with Galaxy's dev requirements: `. .venv/bin/activate` 3. Update Galaxy's dev dependencies (if you haven't done this in a while): `pip install -r lib/galaxy/dependencies/dev-requirements.txt`