build: fix running tests for CI

ING-3267
halestudio · Nov 11, 2022 · a2d056a · a2d056a
1 parent 8312686
commit a2d056a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/build-hale.sh b/build-hale.sh
@@ -3,7 +3,7 @@
 # Default HALE builds
 ./build.sh clean
 ./build.sh product HALE -o linux -a x86_64
-./build.sh product HALE -o linux -a x86
+#./build.sh product HALE -o linux -a x86
 ./build.sh product HALE -o windows -a x86_64
-./build.sh product HALE -o windows -a x86
+#./build.sh product HALE -o windows -a x86
 ./build.sh product HALE -o macosx -a x86_64
diff --git a/build/build.gradle b/build/build.gradle
@@ -128,7 +128,6 @@ ext {
 		'eu.esdihumboldt.hale.io.xslt.feature.ui',
 		'eu.esdihumboldt.hale.io.xslt.test',
 		'eu.esdihumboldt.hale.io.xslt.ui',
-		'eu.esdihumboldt.hale.app.transform.test',
 		'eu.esdihumboldt.hale.common.cache.test',
 		'eu.esdihumboldt.util.blueprints.entities.test',
 		'eu.esdihumboldt.hale.io.oml',

diff --git a/build/gradle/commitAndProductionStage.gradle b/build/gradle/commitAndProductionStage.gradle
@@ -419,7 +419,8 @@ def includeAdditionalFiles(artifacts, relsrcpath, productOutputPath, reldstpath,
 				}
 				if (reldstpath.equals("jre")){
 					//update HALE.ini file with the JRE path bundled in the Eclipse.app.
-					updateHaleIniFileWithJrePath(productOutputPath.absolutePath + "/Eclipse.app/Contents/Eclipse/HALE.ini")
+					def launcherName=  getProductLauncher()
+					updateHaleIniFileWithJrePath(productOutputPath.absolutePath + "/Eclipse.app/Contents/Eclipse/${launcherName}.ini")
 				}
 			}
         }

diff --git a/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product b/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
@@ -457,7 +457,6 @@
       <plugin id="org.eclipse.e4.ui.workbench"/>
       <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
       <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
       <plugin id="org.eclipse.e4.ui.workbench.swt"/>
       <plugin id="org.eclipse.e4.ui.workbench3"/>
       <plugin id="org.eclipse.emf.common"/>
@@ -490,10 +489,8 @@
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
       <plugin id="org.eclipse.text"/>
       <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>
       <plugin id="org.eclipse.ui.workbench"/>
       <plugin id="org.eclipse.xsd"/>
       <plugin id="org.eclipse.zest.core"/>