Changeset 37345

Timestamp:

2023-02-24T12:06:43+13:00 (4 weeks ago)

Author:

kjdon

Message:

use --non-interactive and --trust-server-cert options to svn so that we don't need to manually accept the certificate every 3 months (and which causes the build to fail when it hasn't been done)

Location:

main/trunk

Files:

• gs-release-builder/envi/etc/tasks/snapshot/task.pl (modified) (1 diff)
• release-kits/kits/rk3/ant-scripts/compile.xml (modified) (11 diffs)
• release-kits/shared/core/ant-scripts/shared.xml (modified) (1 diff)

main/trunk/gs-release-builder/envi/etc/tasks/snapshot/task.pl

@@ -136 +136 @@
     #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 --non-interactive --trust-server-cert info https://svn.greenstone.org/main/$ENV{'BRANCH_PATH'}|" )
         or die "Cant determine age of stable tag";
     my $changed_date;

main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

@@ -2 +2 @@
 <project name="rk3-compile">
 
+
     <target name="compile">
 
         <!-- checkout greenstone3 -->
         <exec executable="svn">
-            <arg value="checkout"/>
-            <arg value="${svn.root}/main/${branch.path}/greenstone3"/>
-            <arg value="compiled"/>
-            <arg value="-r"/><arg value="${branch.revision}"/>
+          <arg line="${global-svn-args}"/>
+          <arg value="checkout"/>
+          <arg value="${svn.root}/main/${branch.path}/greenstone3"/>
+          <arg value="compiled"/>
+          <arg value="-r"/><arg value="${branch.revision}"/>
         </exec>
 
@@ -51 +53 @@
             <propertyset refid="forward.properties"/>
             <property name="properties.accepted" value="true"/>
+            <property name="global-svn-args" value="${global-svn-args}"/>
         </ant>
 
@@ -76 +79 @@
                 <echo>EXPORTING GNOME LIB EXTENSION</echo>
                 <exec executable="svn">
+                  <arg line="${global-svn-args}"/>
                     <arg value="export"/>
                     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${specific.os.type}${arch}${extension-x64}.tar.gz"/>
@@ -103 +107 @@
             <property name="properties.accepted" value="true"/>
             <property name="properties.keep.src" value="${keep.src}"/>
+            <property name="global-svn-args" value="${global-svn-args}"/>
         </ant>
 
@@ -185 +190 @@
             <!--<unzip src="${rk.home}/shared/windows/perl.zip" dest="compiled/gs2build/bin/windows"/>-->
             <exec executable="svn" dir="compiled/gs2build/bin/windows">
+              <arg line="${global-svn-args}"/>
                 <arg value="export"/>
                 <arg value="${svn.root}/main/trunk/release-kits/shared/windows/perl.zip"/>
@@ -223 +229 @@
 
             <exec executable="svn">
-               <arg value="export"/>
+          <arg line="${global-svn-args}"/>
+              <arg value="export"/>
                <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-linux${extension-x64}.tar.gz"/>
                <arg value="compiled/ext/imagemagick-linux${extension-x64}.tar.gz"/>
@@ -240 +247 @@
             <!--<delete dir="compiled/gs2build/bin/linux/imagemagick"/>
             <exec executable="svn">
+            <arg line="${global-svn-args}"/>
                 <arg value="export"/>
                 <arg value="${svn.root}/main/${branch.path}/binaries/linux/imagemagick"/>
@@ -249 +257 @@
             <!--<delete dir="compiled/gs2build/bin/linux/wv"/>
             <exec executable="svn">
+            <arg line="${global-svn-args}"/>
                 <arg value="export"/>
                 <arg value="${svn.root}/main/${branch.path}/binaries/linux/wv"/>
@@ -261 +270 @@
 
             <!--<exec executable="svn">
+            <arg line="${global-svn-args}"/>
                <arg value="export"/>
                <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-darwin-10.5.tar.gz"/>
@@ -278 +288 @@
             <delete dir="compiled/gs2build/bin/darwin/imagemagick"/>
             <exec executable="svn">
+              <arg line="${global-svn-args}"/>
                 <arg value="export"/>
                 <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/>
@@ -287 +298 @@
                 <delete dir="compiled/gs2build/bin/darwin/ghostscript"/>
                 <exec executable="svn">
+                  <arg line="${global-svn-args}"/>
                     <arg value="export"/>
                     <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/>

main/trunk/release-kits/shared/core/ant-scripts/shared.xml

@@ -57 +57 @@
 
         <!-- svn root -->
-        <property name="svn.root" value="https://svn.greenstone.org" />
-
+        <property name="svn.root" value="https://svn.greenstone.org"/>
+
+        <!-- any global svn args that need to be used in each call - currently we have ones
+             that mean we can ignore the non trusted certificate, which comes up every
+             three months when our SSL certificate is renewed. -->
+        <property name="global-svn-args" value="--non-interactive --trust-server-cert"/>
         <!-- the minimum version of java which the installer should be run with (this gets used in search4j) -->
         <property name="java.min.version" value="1.8.0_00"/>