summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2020-01-22 07:48:06 -0500
committerMatthew Heon <mheon@redhat.com>2020-01-22 07:51:09 -0500
commit554b8d2f2fdcced126f1c9160e8b9241a234dc2e (patch)
tree9b85c6774dd3887855075a9bba94d9ea09f1e549
parentd52132b6ecc1c1c9fb955ecee629f8d169ef1119 (diff)
downloadpodman-554b8d2f2fdcced126f1c9160e8b9241a234dc2e.tar.gz
podman-554b8d2f2fdcced126f1c9160e8b9241a234dc2e.tar.bz2
podman-554b8d2f2fdcced126f1c9160e8b9241a234dc2e.zip
Update release script to not manage epoch
We removed the Gitvalidation epoch in the Makefile. As such, we don't need to adjust it anymore when we tag releases. Signed-off-by: Matthew Heon <mheon@redhat.com>
-rwxr-xr-xhack/release.sh15
1 files changed, 0 insertions, 15 deletions
diff --git a/hack/release.sh b/hack/release.sh
index 56a853347..7c22aed42 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -36,12 +36,6 @@ write_spec_version()
sed -i "s/^\(Version: *\).*/\1${LOCAL_VERSION}/" contrib/spec/podman.spec.in
}
-write_makefile_epoch()
-{
- LOCAL_EPOCH="$1"
- sed -i "s/^\(EPOCH_TEST_COMMIT ?= \).*/\1${LOCAL_EPOCH}/" Makefile
-}
-
write_changelog()
{
echo "- Changelog for v${VERSION} (${DATE})" >.changelog.txt &&
@@ -66,17 +60,8 @@ dev_version_commit()
git commit -asm "Bump to v${NEXT_VERSION}-dev"
}
-epoch_commit()
-{
- LOCAL_EPOCH="$1"
- write_makefile_epoch "${LOCAL_EPOCH}" &&
- git commit -asm 'Bump gitvalidation epoch'
-}
-
git fetch origin &&
git checkout -b "bump-${VERSION}" origin/master &&
-EPOCH=$(git rev-parse HEAD) &&
release_commit &&
git tag -s -m "version ${VERSION}" "v${VERSION}" &&
dev_version_commit &&
-epoch_commit "${EPOCH}"