Changeset 34940

Timestamp:

2021-02-28T22:46:37+13:00 (3 years ago)

Author:

anupama

Message:

Previous commit was from Win machine, this from 32 bit LSB linux. Committing to preserve more changes to do the http to https changeovers. The 32 bit linux VM did not have wget as part of the LSB env, and after adding in a GS compiled wget (which has https support) to release-kits/bin, running it with the --no-check-certificate flag allowed bypassing the need for the 32 bit LSB's snapshots' task.pl file to hardcode the next version number of GS2 and GS3. Other release machines obtained this info from a file on greenstone.org, which the 32 bit LSB task.pl now does too with the wget in release-kits.

File:

• other-projects/nightly-tasks/snapshot/trunk/task.pl (modified) (4 diffs)

other-projects/nightly-tasks/snapshot/trunk/task.pl

@@ -106 +106 @@
 
 #keep wget/curl base command in a variable
-my $httpRetrieve = $^O eq "darwin" ? "curl" : "wget -O -";
+my $httpRetrieve = $^O eq "darwin" ? "curl" : "wget --no-check-certificate -O -";
 
 #print STDERR "@@@@@@@@@@ PATH: ".$ENV{'PATH'}."\n";
@@ -117 +117 @@
     if ( $major_version == 2 ) {
             $ENV{'snapshot_id2'} = `$httpRetrieve https://www.greenstone.org/next-release.txt`;
+        #HARDCODED DUE TO THE 32 BIT LSB ENVIRONMENT NOT HAVING WGET
+        #$ENV{'snapshot_id2'} = "2.88";
         chomp($ENV{'snapshot_id2'});
     } else {
         $ENV{'snapshot_id3'} = `$httpRetrieve https://www.greenstone.org/next-release-greenstone3.txt`;
+        #HARDCODED DUE TO THE 32 BIT LSB ENVIRONMENT NOT HAVING WGET
+        #$ENV{'snapshot_id3'} = "3.10";
         chomp($ENV{'snapshot_id3'});
     }
@@ -142 +146 @@
     #set the path to server.exe
     $ENV{'SERVER_EXE_LOCATION'} = "https://www.greenstone.org/caveat-emptor/latest-server.exe";
-
+    
 } elsif ( $ENV{'TASK_NAME'} =~ "stable\$" ) {
     $ENV{'SNAPSHOT_MODE'} = "stable";
@@ -149 +153 @@
     #dont proceed if main/stable is old
     #get last changed date from svn
-    open( INFO, "svn info http://svn.greenstone.org/main/$ENV{'BRANCH_PATH'}|" )
+    open( INFO, "svn info https://svn.greenstone.org/main/$ENV{'BRANCH_PATH'}|" )
         or die "Cant determine age of stable tag";
     my $changed_date;