From 59b9a84320df212af939174a81f3ae96d61460d9 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Tue, 14 Oct 2025 16:03:44 -0700 Subject: [PATCH 1/2] chore: fix create_archive_and_notes to ignore release tool markers --- .github/workflows/create_archive_and_notes.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_archive_and_notes.sh b/.github/workflows/create_archive_and_notes.sh index a21585f866..444569c2c9 100755 --- a/.github/workflows/create_archive_and_notes.sh +++ b/.github/workflows/create_archive_and_notes.sh @@ -18,7 +18,13 @@ set -o errexit -o nounset -o pipefail # Exclude dot directories, specifically, this file so that we don't # find the substring we're looking for in our own file. # Exclude CONTRIBUTING.md, RELEASING.md because they document how to use these strings. -if grep --exclude=CONTRIBUTING.md --exclude=RELEASING.md --exclude-dir=.* VERSION_NEXT_ -r; then +grep --exclude=CONTRIBUTING.md \ + --exclude=RELEASING.md \ + --exclude=release.py \ + --exclude=release_test.py \ + --exclude-dir=.* \ + VERSION_NEXT_ -r +if $?; then echo echo "Found VERSION_NEXT markers indicating version needs to be specified" exit 1 From 10c8ef44359ffbdf7144e31fc4f66db31f0288ae Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Tue, 14 Oct 2025 18:21:46 -0700 Subject: [PATCH 2/2] fix error checking --- .github/workflows/create_archive_and_notes.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_archive_and_notes.sh b/.github/workflows/create_archive_and_notes.sh index 444569c2c9..b53c49aa09 100755 --- a/.github/workflows/create_archive_and_notes.sh +++ b/.github/workflows/create_archive_and_notes.sh @@ -13,8 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -o errexit -o nounset -o pipefail +set -o nounset +set -o pipefail +set -o errexit +set -x # Exclude dot directories, specifically, this file so that we don't # find the substring we're looking for in our own file. # Exclude CONTRIBUTING.md, RELEASING.md because they document how to use these strings. @@ -23,8 +26,9 @@ grep --exclude=CONTRIBUTING.md \ --exclude=release.py \ --exclude=release_test.py \ --exclude-dir=.* \ - VERSION_NEXT_ -r -if $?; then + VERSION_NEXT_ -r || grep_exit_code=$? + +if [[ $grep_exit_code -eq 0 ]]; then echo echo "Found VERSION_NEXT markers indicating version needs to be specified" exit 1