Change in osmo-gsm-tester[master]: Move update_version.sh to contrib/
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 ) Change subject: Move update_version.sh to contrib/ .. Move update_version.sh to contrib/ Change-Id: I26218cd512a739fc26ba04be05f01260152d785f --- M .gitignore M Makefile A contrib/update_version.sh D update_version.sh 4 files changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/17/18217/1 diff --git a/.gitignore b/.gitignore index a0c4088..ad9b423 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ __pycache__ pid .*.sw? -version +.version _version.py tags set_pythonpath diff --git a/Makefile b/Makefile index 38ff6c8..558f739 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ ./contrib/check_dependencies.py version: - ./update_version.sh + ./contrib/update_version.sh manual: $(MAKE) -C doc/manuals diff --git a/contrib/update_version.sh b/contrib/update_version.sh new file mode 100755 index 000..ab2674a --- /dev/null +++ b/contrib/update_version.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e +ROOTDIR=$(git rev-parse --show-toplevel) +git describe --abbrev=8 --dirty | sed 's/v\([^-]*\)-\([^-]*\)-\(.*\)/\1.dev\2.\3/' > $ROOTDIR/.version +cat $ROOTDIR/.version +echo "# osmo-gsm-tester version. +# Automatically generated by update_version.sh. +# Gets imported by __init__.py. + +_version = '$(cat $ROOTDIR/.version)'" \ + > $ROOTDIR/src/osmo_gsm_tester/_version.py diff --git a/update_version.sh b/update_version.sh deleted file mode 100755 index 3d5fe42..000 --- a/update_version.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e -git describe --abbrev=8 --dirty | sed 's/v\([^-]*\)-\([^-]*\)-\(.*\)/\1.dev\2.\3/' > version -cat version -echo "# osmo-gsm-tester version. -# Automatically generated by update_version.sh. -# Gets imported by __init__.py. - -_version = '$(cat version)'" \ - > src/osmo_gsm_tester/_version.py -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I26218cd512a739fc26ba04be05f01260152d785f Gerrit-Change-Number: 18217 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: Move update_version.sh to contrib/
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 ) Change subject: Move update_version.sh to contrib/ .. Move update_version.sh to contrib/ Change-Id: I26218cd512a739fc26ba04be05f01260152d785f --- M .gitignore M Makefile A contrib/update_version.sh D update_version.sh 4 files changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/17/18217/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I26218cd512a739fc26ba04be05f01260152d785f Gerrit-Change-Number: 18217 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: Move update_version.sh to contrib/
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 ) Change subject: Move update_version.sh to contrib/ .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I26218cd512a739fc26ba04be05f01260152d785f Gerrit-Change-Number: 18217 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 May 2020 12:53:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: Move update_version.sh to contrib/
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 ) Change subject: Move update_version.sh to contrib/ .. Move update_version.sh to contrib/ Change-Id: I26218cd512a739fc26ba04be05f01260152d785f --- M .gitignore M Makefile A contrib/update_version.sh D update_version.sh 4 files changed, 13 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index a0c4088..ad9b423 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ __pycache__ pid .*.sw? -version +.version _version.py tags set_pythonpath diff --git a/Makefile b/Makefile index 38ff6c8..558f739 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ ./contrib/check_dependencies.py version: - ./update_version.sh + ./contrib/update_version.sh manual: $(MAKE) -C doc/manuals diff --git a/contrib/update_version.sh b/contrib/update_version.sh new file mode 100755 index 000..ab2674a --- /dev/null +++ b/contrib/update_version.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e +ROOTDIR=$(git rev-parse --show-toplevel) +git describe --abbrev=8 --dirty | sed 's/v\([^-]*\)-\([^-]*\)-\(.*\)/\1.dev\2.\3/' > $ROOTDIR/.version +cat $ROOTDIR/.version +echo "# osmo-gsm-tester version. +# Automatically generated by update_version.sh. +# Gets imported by __init__.py. + +_version = '$(cat $ROOTDIR/.version)'" \ + > $ROOTDIR/src/osmo_gsm_tester/_version.py diff --git a/update_version.sh b/update_version.sh deleted file mode 100755 index 3d5fe42..000 --- a/update_version.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e -git describe --abbrev=8 --dirty | sed 's/v\([^-]*\)-\([^-]*\)-\(.*\)/\1.dev\2.\3/' > version -cat version -echo "# osmo-gsm-tester version. -# Automatically generated by update_version.sh. -# Gets imported by __init__.py. - -_version = '$(cat version)'" \ - > src/osmo_gsm_tester/_version.py -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I26218cd512a739fc26ba04be05f01260152d785f Gerrit-Change-Number: 18217 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged