aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-10-24 01:10:26 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-10-24 01:22:21 +0200
commitb06912270f5f44e02b0d42e6ed16ad85addb8af1 (patch)
treecb8661c46196359b59aafc13742b01d031c9b252
parentbb89d901d2c54a9ae6208365aab9b47de3fffd50 (diff)
downloadvendor_replicant-release-scripts-b06912270f5f44e02b0d42e6ed16ad85addb8af1.tar.gz
vendor_replicant-release-scripts-b06912270f5f44e02b0d42e6ed16ad85addb8af1.tar.bz2
vendor_replicant-release-scripts-b06912270f5f44e02b0d42e6ed16ad85addb8af1.zip
Remove VERSION to be able to use release.sh on branches too
To use these scripts, users and developers are expected to define the VERSION and RELEASE variables. For instance: VERSION="6.0" RELEASE="0004-rc2" However if you want to build Replicant 6.0 not as part of an official release process, all the scripts expect a minor version, which is not relevant for a branch. This could for instance be used by anyone, including people that don't have the ability to push tags to release their own builds of Replicant along with information about the source code used to produce these images. So instead of the VERSION and RELEASE example above we could have: RELEASE="6.0-0004-rc2" Or if we build a branch: RELEASE="6.0" Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rwxr-xr-xrelease.sh4
-rwxr-xr-xreleasetag.sh7
-rwxr-xr-xreleasevars.sh24
3 files changed, 18 insertions, 17 deletions
diff --git a/release.sh b/release.sh
index ed30084..f380f8b 100755
--- a/release.sh
+++ b/release.sh
@@ -162,7 +162,7 @@ release_metadata_changelog () {
}
release_metadata_release () {
- echo "replicant-$VERSION-$RELEASE" > "$METADATA/release.txt"
+ echo "replicant-$RELEASE" > "$METADATA/release.txt"
}
release_metadata_prebuilt () {
@@ -183,7 +183,7 @@ release_metadata_git () {
do
cd $git_repo
echo "manifest"
- git show --format=oneline -s "replicant-$VERSION-$RELEASE"
+ git show --format=oneline -s "replicant-$RELEASE"
echo ""
cd "$REPLICANT_DIR"
diff --git a/releasetag.sh b/releasetag.sh
index a1ef8f5..874ef2e 100755
--- a/releasetag.sh
+++ b/releasetag.sh
@@ -33,11 +33,12 @@ set_color
tag_repos () {
dir=$( pwd )
cd "$REPLICANT_DIR"
+ TAG_MESSAGE="Replicant $(echo $RELEASE | sed 's/-/ /') images release"
TAGGING_CMD="echo \"Tagging $color_start \$REPO_PROJECT $color_end\" && \
- git tag -u $RELEASE_KEY -m \"Replicant $VERSION $RELEASE images release\" \
- \"replicant-$VERSION-$RELEASE\""
+ git tag -u $RELEASE_KEY -m \"${TAG_MESSAGE}\" \
+ \"replicant-$RELEASE\""
PUSHING_CMD="echo \"Pushing $color_start \$REPO_PROJECT $color_end\" && \
- git push \"git@$PUSH_REMOTE:\$REPO_PROJECT\" \"replicant-$VERSION-$RELEASE\""
+ git push \"git@$PUSH_REMOTE:\$REPO_PROJECT\" \"replicant-$RELEASE\""
repo forall -c "$TAGGING_CMD && $PUSHING_CMD"
repo forall -c "$TAGGING_CMD && $PUSHING_CMD"
diff --git a/releasevars.sh b/releasevars.sh
index 1613d0f..0f885db 100755
--- a/releasevars.sh
+++ b/releasevars.sh
@@ -16,8 +16,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-VERSION="6.0"
-RELEASE="0004-rc2"
+RELEASE="6.0"
+
# The files are in out/dist/${device}/
RELEASE_IMAGES="\
recovery-i9100.img \
@@ -30,16 +30,16 @@ RELEASE_IMAGES="\
recovery-i9305.img \
recovery-n5100.img \
recovery-n5110.img \
- replicant-${VERSION}-${RELEASE}-i9100.zip \
- replicant-${VERSION}-${RELEASE}-n7000.zip \
- replicant-${VERSION}-${RELEASE}-maguro.zip \
- replicant-${VERSION}-${RELEASE}-espressowifi.zip \
- replicant-${VERSION}-${RELEASE}-espresso3g.zip \
- replicant-${VERSION}-${RELEASE}-i9300.zip \
- replicant-${VERSION}-${RELEASE}-n7100.zip \
- replicant-${VERSION}-${RELEASE}-i9305.zip \
- replicant-${VERSION}-${RELEASE}-n5100.zip \
- replicant-${VERSION}-${RELEASE}-n5110.zip \
+ replicant-${RELEASE}-i9100.zip \
+ replicant-${RELEASE}-n7000.zip \
+ replicant-${RELEASE}-maguro.zip \
+ replicant-${RELEASE}-espressowifi.zip \
+ replicant-${RELEASE}-espresso3g.zip \
+ replicant-${RELEASE}-i9300.zip \
+ replicant-${RELEASE}-n7100.zip \
+ replicant-${RELEASE}-i9305.zip \
+ replicant-${RELEASE}-n5100.zip \
+ replicant-${RELEASE}-n5110.zip \
"
RELEASE_DEVICES="\