fixup! build: migrate build to GitHub Actions

halestudio · Apr 16, 2024 · b8959cb · b8959cb
1 parent ebf7376
commit b8959cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build/gradle/commitAndProductionStage.gradle b/build/gradle/commitAndProductionStage.gradle
@@ -1033,10 +1033,13 @@ task buildProduct(dependsOn: createProductFeature) {
 	doFirst{
 		def projectRoot = project.ext.rootDir.path
 		System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY, projectRoot);
+
+		// attempt to work around issue on GitHub Actions where downloading dependencies with Maven fails
+		System.setProperty( 'maven.wagon.httpconnectionManager.ttlSeconds', '60' )
 	}	
 	doLast {
 		def projectRoot = project.ext.rootDir.path
-	    def res = new MavenCli().doMain([ '-e', 'package', "-Dmaven.test.failure.ignore=true", "-Dmaven.wagon.httpconnectionManager.ttlSeconds=60"] as String[], project.ext.rootDir.path , System.out, System.err)
+	    def res = new MavenCli().doMain([ '-e', 'package'] as String[], project.ext.rootDir.path , System.out, System.err)
 	    if (res != 0) {
 	        throw new RuntimeException("Maven failed with exit code ${res}")
 	    }

diff --git a/build/gradle/updateSite.gradle b/build/gradle/updateSite.gradle
@@ -161,8 +161,12 @@ task buildUpdateSite(dependsOn: [ createUpdateSiteFeature, generatePomFiles ]) {
 	    pg.generateParentPomFile(parentPomConfig)
 
 		System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY, project.ext.rootDir.path);
+
+		// attempt to work around issue on GitHub Actions where downloading dependencies with Maven fails
+		System.setProperty( 'maven.wagon.httpconnectionManager.ttlSeconds', '60' )
+
 	    // build update site
-	    def res = new MavenCli().doMain([ 'package', "-Dmaven.test.failure.ignore=true", "-Dmaven.wagon.httpconnectionManager.ttlSeconds=60"] as String[], project.ext.rootDir.path, System.out, System.err)
+	    def res = new MavenCli().doMain([ 'package' ] as String[], project.ext.rootDir.path, System.out, System.err)
 	    if (res != 0) {
 	        throw new RuntimeException("Maven failed with exit code ${res}")
 	    }