diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-22 15:23:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 15:23:22 -0500 |
| commit | f1409dd548044ea56158fd1b0d1efff9f79e9cc3 (patch) | |
| tree | fde3d8e14d75abcace3c46d335bde81cecc12c64 | |
| parent | c42383f70a7832faf1ba920d6c9e169a88b0e4d9 (diff) | |
| parent | 554b8d2f2fdcced126f1c9160e8b9241a234dc2e (diff) | |
| download | podman-f1409dd548044ea56158fd1b0d1efff9f79e9cc3.tar.gz podman-f1409dd548044ea56158fd1b0d1efff9f79e9cc3.tar.bz2 podman-f1409dd548044ea56158fd1b0d1efff9f79e9cc3.zip | |
Merge pull request #4930 from mheon/fix_release_script
Update release script to not manage epoch
| -rwxr-xr-x | hack/release.sh | 15 |
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}" |