From 554b8d2f2fdcced126f1c9160e8b9241a234dc2e Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 22 Jan 2020 07:48:06 -0500 Subject: 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 --- hack/release.sh | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'hack/release.sh') 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}" -- cgit v1.2.3-54-g00ecf