jenkins-builds/promote-to-release-ssh-git.sh: Add the maven make-all-jogamp.sh deployment step and log to file; Drop ssh-scp variant.

2 files changed, 15 insertions, 26 deletions

diff --git a/jenkins-builds/promote-to-release-ssh-git.sh b/jenkins-builds/promote-to-release-ssh-git.sh
index bde6a27..2faa349 100644
--- a/jenkins-builds/promote-to-release-ssh-git.sh
+++ b/jenkins-builds/promote-to-release-ssh-git.sh
@@ -1,11 +1,15 @@
 #! /bin/bash
 
-version=v2.4.0-rc-20200104
+version=v2.4.0-rc-20230201
 rootdir=/srv/www/jogamp.org/deployment
-adir=archive/master/gluegen_930-joal_652-jogl_1493-jocl_1137
+adir=archive/master/gluegen_951-joal_669-jogl_1518-jocl_1158
 sdir=archive/rc
 urlb=https://jogamp.org/deployment
 
+logfile=`basename $0 .sh`.log
+
+function deploy_it() {
+
 ssh [email protected] "\
     cd /home/jogamp/builds ; \
     rm -rf jogamp-scripting ; \
@@ -22,3 +26,12 @@ scp [email protected]:$rootdir/$sdir/$version/sha512sum.txt .
 gpg --output sha512sum.txt.sig --detach-sig sha512sum.txt
 gpg --verify sha512sum.txt.sig sha512sum.txt && \
 scp sha512sum.txt.sig [email protected]:$rootdir/$sdir/$version/
+
+ssh [email protected] "\
+    cd /home/jogamp/builds/jogamp-scripting/maven ; \
+    ./make-all-jogamp.sh $rootdir/$sdir/$version/archive/jogamp-all-platforms.7z $version ; \
+"
+
+}
+
+deploy_it 2>&1 | tee ${logfile}
diff --git a/jenkins-builds/promote-to-release-ssh-scp.sh b/jenkins-builds/promote-to-release-ssh-scp.sh
deleted file mode 100644
index 72a0660..0000000
--- a/jenkins-builds/promote-to-release-ssh-scp.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-version=v2.4.0-rc-20200104
-rootdir=/srv/www/jogamp.org/deployment
-adir=archive/master/gluegen_930-joal_652-jogl_1493-jocl_1137
-sdir=archive/rc
-urlb=https://jogamp.org/deployment
-
-ssh [email protected] "rm -rf jogamp-scripting; mkdir jogamp-scripting"
-scp -rp jenkins-builds deployment [email protected]:jogamp-scripting/
-
-ssh [email protected] "\
-    cd jogamp-scripting ; \
-    git status ; \
-    ./jenkins-builds/promote-to-release.sh \
-        $version \
-        $rootdir \
-        $adir $sdir $urlb ; \
-"
-
-scp [email protected]:$rootdir/$sdir/$version/sha512sum.txt .
-gpg --output sha512sum.txt.sig --detach-sig sha512sum.txt
-gpg --verify sha512sum.txt.sig sha512sum.txt && \
-scp sha512sum.txt.sig [email protected]:$rootdir/$sdir/$version/