osmith submitted this change.

View Change


Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved
osmo-release: don't default to REL=patch

Make this script easier to use by showing the user the possible values
for REL and other environment variables when REL is missing instead of
assuming that they want REL=patch.

Change-Id: I3041cbace651cd477e0aa8abe56ce6b9bf1b011c
---
M osmo-release.mk
M osmo-release.sh
2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/osmo-release.mk b/osmo-release.mk
index 01285b1..cd83397 100644
--- a/osmo-release.mk
+++ b/osmo-release.mk
@@ -1,9 +1,2 @@
-ifndef REL
- REL := patch
-endif
-
release:
-ifeq ($(origin REL), file)
- @echo "No REL value specified, defaulting to 'patch' release"
-endif
@osmo-release.sh $(VERSION) $(REL)
diff --git a/osmo-release.sh b/osmo-release.sh
index e947fe4..8b3bbd1 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -3,8 +3,17 @@
REL=$2

if [ "z$REL" = "z" ]; then
- echo "No REL value specified, defaulting to 'patch' release"
- REL="patch"
+ echo "usage: make REL=patch|minor|major release"
+ echo
+ echo "optional environment variables:"
+ echo " DRY_RUN=1 run checks but make no modifications"
+ echo " ALLOW_NO_LIBVERSION_CHANGE=1 skip LIBVERSION in Makefile.am fchecks"
+ echo " ALLOW_NO_LIBVERSION_DEB_MATCH=1 skip LIBVERSION in debian packaging checks"
+ echo " ALLOW_NO_LIBVERSION_RPM_MATCH=1 skip LIBVERSION in rpm packaging checks"
+ echo
+ echo "See also:"
+ echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release"
+ exit 1
fi

ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}"

To view, visit change 37560. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I3041cbace651cd477e0aa8abe56ce6b9bf1b011c
Gerrit-Change-Number: 37560
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged