From 5faa6273b98f46089f9a80a08673e746d09ec0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 9 Nov 2024 08:57:59 +0100 Subject: [PATCH] create-release.sh: replace master with main --- bin/create-release.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/create-release.sh b/bin/create-release.sh index 7d5536f..6428e8a 100755 --- a/bin/create-release.sh +++ b/bin/create-release.sh @@ -11,8 +11,8 @@ if [[ -z $version ]]; then exit 1 fi -if [[ "$(git symbolic-ref --short HEAD)" != "master" ]]; then - echo "must be on master branch" >&2 +if [[ "$(git symbolic-ref --short HEAD)" != "main" ]]; then + echo "must be on main branch" >&2 exit 1 fi @@ -22,8 +22,8 @@ if [[ -n $uncommitted_changes ]]; then echo -e "There are uncommitted changes, exiting:\n${uncommitted_changes}" >&2 exit 1 fi -git pull git@github.com:Mic92/nix-update master -unpushed_commits=$(git log --format=oneline origin/master..master) +git pull git@github.com:Mic92/nix-update main +unpushed_commits=$(git log --format=oneline origin/main..main) if [[ $unpushed_commits != "" ]]; then echo -e "\nThere are unpushed changes, exiting:\n$unpushed_commits" >&2 exit 1 @@ -35,4 +35,4 @@ nix develop -c pytest -s . git commit -m "bump version ${version}" git tag -e "${version}" -echo "now run 'git push --tags origin master'" +echo "now run 'git push --tags origin main'"