diff options
| author | Chris Evich <cevich@redhat.com> | 2021-06-30 11:39:19 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2021-06-30 11:39:19 -0400 |
| commit | 40ef17ac282fab7229a121635f81842fb5d65eb0 (patch) | |
| tree | 8771790b2fadb7b0a47ce9d67c4440426444c6f0 /hack | |
| parent | 056f492f59c333d521ebbbe186abde0278e815db (diff) | |
| download | podman-40ef17ac282fab7229a121635f81842fb5d65eb0.tar.gz podman-40ef17ac282fab7229a121635f81842fb5d65eb0.tar.bz2 podman-40ef17ac282fab7229a121635f81842fb5d65eb0.zip | |
Cirrus: Fixes due to master->main rename
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/get_release_info.sh | 2 | ||||
| -rwxr-xr-x | hack/release.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hack/get_release_info.sh b/hack/get_release_info.sh index b3e208ac9..e1020e677 100755 --- a/hack/get_release_info.sh +++ b/hack/get_release_info.sh @@ -16,7 +16,7 @@ valid_args() { # `git describe` will never produce a useful version number under all # branches. This is because the podman release process (see `RELEASE_PROCESS.md`) -# tags release versions only on release-branches (i.e. never on master). +# tags release versions only on release-branches (i.e. never on main). # Scraping the version number directly from the source, is the only way # to reliably obtain the number from all the various contexts supported by # the `Makefile`. diff --git a/hack/release.sh b/hack/release.sh index e9eeaa73b..34842de2e 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -61,7 +61,7 @@ dev_version_commit() } git fetch origin && -git checkout -b "bump-${VERSION}" origin/master && +git checkout -b "bump-${VERSION}" origin/main && release_commit && git tag -s -m "version ${VERSION}" "v${VERSION}" && dev_version_commit |