diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index e9d9864496..2412f5e7c3 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -10,20 +10,9 @@ assignees: '' ## 1. Preparation on Thursday - [ ] Merge pull requests in the [Ready To Go] column -- [ ] Include translations -
Command line instructions: -
-    
-    git checkout master
-    git pull upstream master
-    tx pull --force
-    git commit -a -m "Update all locales with the latest Transifex translations"
-    git push upstream master
-    
-    
-
+- [ ] Include translations: `script/release/udpate_locales` - [ ] Create a tag: - - `script/tag_release` will auto increment patch version, otherwise + - `script/release/tag` will auto increment patch version, otherwise - `git push upstream HEAD:refs/tags/vX.Y.Z` - [ ] [Draft new release]. Look at previous [releases] for inspiration. - Select new release tag diff --git a/script/release/prepare b/script/release/prepare index cfc16b0577..64eb366a17 100755 --- a/script/release/prepare +++ b/script/release/prepare @@ -4,6 +4,8 @@ # set -e +# todo: ask to confirm, and remind to check the ready to go column. + # Download translations and push to master $(dirname "$0")/update_locales diff --git a/script/release/tag b/script/release/tag index 718397ef27..1cdeb103d9 100755 --- a/script/release/tag +++ b/script/release/tag @@ -5,6 +5,8 @@ # This supports only patch releases at the moment but can be developed # further. +puts "\n*** Fetching latest release tag... ***\n" + # Fetch current tags first: `git fetch upstream --tags` @@ -18,7 +20,10 @@ latest_version = Gem::Version.new(latest_tag[1..-1]) major, minor, patch = latest_version.segments next_tag = "v#{major}.#{minor}.#{patch.succ}" +# Push the new tag +puts "\n*** Pushing new release tag #{next_tag}... ***\n" puts `git push upstream 'HEAD:refs/tags/#{next_tag}'` +# Shortcuts puts "Draft a new release with this tag: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=#{next_tag}&title=#{next_tag}+Code+Name"