Attention is currently required from: Angel Pons, Felix Singer, Jason Glenesk, Martin L Roth.
Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75780?usp=email )
Change subject: Switch release scripts over to use main branch ......................................................................
Switch release scripts over to use main branch
In preparation for switching over coreboot.
Change-Id: Id66f0def84b913fc8fdd4ee77fef996e45dbd4f5 Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org --- M util/release/genrelnotes M util/release/gerrit_stats.pl 2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/75780/1
diff --git a/util/release/genrelnotes b/util/release/genrelnotes index 1bbe554..c1b1195 100755 --- a/util/release/genrelnotes +++ b/util/release/genrelnotes @@ -28,7 +28,7 @@
# Try to verify that the repo is clean before losing state. if ! git diff-index --quiet --cached HEAD 2>/dev/null || \ - [ "$(git diff origin/master --shortstat 2>/dev/null | tail -n1)" != "" ]; then + [ "$(git diff origin/main --shortstat 2>/dev/null | tail -n1)" != "" ]; then echo "ERROR: repo is not clean. Exiting." >&2 exit 1 fi @@ -38,7 +38,7 @@ echo echo "Usage: $0 <old_version> <new_version> [release notes file]" echo "Old version should be a tag (4.1), a branch (origin/4.1), or a commit id" - echo "New version can be a branch (origin/master) a tag (4.2), or a commit id" + echo "New version can be a branch (origin/main) a tag (4.2), or a commit id" echo "Logfile can be a new file or an existing file to update" echo "Example: "$0 origin/4.1 4.2 rnotes.txt"" echo @@ -188,7 +188,7 @@ printf "\n Cleaning up and exiting.\n" >&2 find 'src' -name 'gnumakefile' \ -exec rename 's/gnumakefile/Makefile.inc/' {} ; - git checkout origin/master > /dev/null 2>&1 + git checkout origin/main > /dev/null 2>&1 git submodule update --init --checkout > /dev/null 2>&1 rm "$LOGFILE" exit 1; @@ -299,7 +299,7 @@ printf "Calculating new SLOC\n" NEW_SLOC=$(get_sloc)
-git checkout origin/master > /dev/null 2>&1 +git checkout origin/main > /dev/null 2>&1 git submodule update --init --checkout > /dev/null 2>&1 trap "" SIGINT
diff --git a/util/release/gerrit_stats.pl b/util/release/gerrit_stats.pl index 789cb05..5cb3160 100755 --- a/util/release/gerrit_stats.pl +++ b/util/release/gerrit_stats.pl @@ -706,7 +706,7 @@ sub usage { print "gerrit_stats <options> [Old version] [New version]\n"; print "Old version should be a tag (4.1), a branch (origin/4.1), or a commit id\n"; - print "New version can be 'HEAD' a branch (origin/master) a tag (4.2), or a commit id\n"; + print "New version can be 'HEAD' a branch (origin/main) a tag (4.2), or a commit id\n"; print " Options:\n"; print " u | url [url] url with username.\n"; print "Example: "$0 -u Gaumless@review.coreboot.org:29418 origin/4.1 4.2"\n";