IDE-5116 add windows code sign support

liferay · Nov 22, 2023 · e05d6b1 · e05d6b1
1 parent c12d6fe
commit e05d6b1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -28,7 +28,7 @@ jobs:
           ./csf.sh
   Verify:
     name: Verify
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
       - name: Checkout liferay-ide

diff --git a/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml b/build/installers/liferay-workspace-with-devstudio/liferay-workspace-with-devstudio.xml
@@ -794,6 +794,8 @@ ${java_executable}
     <startMenuGroupName></startMenuGroupName>
     <vendor>Liferay, Inc</vendor>
     <width>600</width>
+    <!-- <windowsSigningPkcs12File>${build_project_directory}/liferay.pfx</windowsSigningPkcs12File>
+    <windowsSigningPkcs12Password>${env(WINDOWS_SIGNING_PASSWORD)}</windowsSigningPkcs12Password> -->
     <parameterList>
         <fileParameter>
             <name>java_executable</name>

diff --git a/build/installers/liferay-workspace-with-devstudio/liferay.pfx b/build/installers/liferay-workspace-with-devstudio/liferay.pfx
diff --git a/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/GradleUtil.java b/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/GradleUtil.java
@@ -56,6 +56,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.JavaRuntime;
 
 import org.gradle.tooling.CancellationTokenSource;
@@ -341,15 +342,18 @@ public static String runGradleTask(
 		GradleBuild gradleBuild = gradleBuildOpt.get();
 
 		try {
+			IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
+
+			File jvmInstallLocation = defaultVMInstall.getInstallLocation();
+
 			if (redirectOutput) {
 				OutputStream outputStream = new ByteArrayOutputStream();
 
 				gradleBuild.withConnection(
 					connection -> {
 						connection.newBuild(
 						).setJavaHome(
-							JavaRuntime.getDefaultVMInstall(
-							).getInstallLocation()
+							jvmInstallLocation
 						).addArguments(
 							arguments
 						).forTasks(
@@ -371,8 +375,7 @@ public static String runGradleTask(
 				connection -> {
 					connection.newBuild(
 					).setJavaHome(
-						JavaRuntime.getDefaultVMInstall(
-						).getInstallLocation()
+						jvmInstallLocation
 					).addArguments(
 						arguments
 					).forTasks(

diff --git a/tools/tests/com.liferay.ide.core.tests/src/com/liferay/ide/core/tests/TestUtil.java b/tools/tests/com.liferay.ide.core.tests/src/com/liferay/ide/core/tests/TestUtil.java
@@ -72,7 +72,7 @@ public static void waitForBuildAndValidation() throws Exception {
 			manager.join(ValidatorManager.VALIDATOR_JOB_FAMILY, new NullProgressMonitor());
 			manager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
 			JobUtil.waitForLiferayProjectJob();
-			Thread.sleep(200);
+			Thread.sleep(500);
 			manager.beginRule(root = workspace.getRoot(), null);
 		}
 		catch (InterruptedException ie) {

diff --git a/....tests/src/com/liferay/ide/project/core/tests/modules/NewLiferayModuleProjectOpTests.java b/....tests/src/com/liferay/ide/project/core/tests/modules/NewLiferayModuleProjectOpTests.java
@@ -183,7 +183,7 @@ public void testNewLiferayModuleProjectNameValidataionService() throws Exception
     {
         NewLiferayModuleProjectOp op = NewLiferayModuleProjectOp.TYPE.instantiate();
 
-        op.setProjectName( "my-test-project" );
+        op.setProjectName( "my-test-project-validataionService" );
 
         assertTrue( op.validation().ok() );
 
@@ -229,7 +229,7 @@ public void testNewLiferayModuleProjectNewProperties() throws Exception
 
         Status exStatus =
             NewLiferayModuleProjectOpMethods.execute( op, ProgressMonitorBridge.create( new NullProgressMonitor() ) );
-
+        
         assertEquals( "OK", exStatus.message() );
 
         TestUtil.waitForBuildAndValidation();
@@ -265,6 +265,8 @@ public void testNewLiferayPanelAppNewProperties() throws Exception
         Status exStatus =
             NewLiferayModuleProjectOpMethods.execute( op, ProgressMonitorBridge.create( new NullProgressMonitor() ) );
 
+        TestUtil.waitForBuildAndValidation();
+
         assertTrue( exStatus.message(), exStatus.ok() );
 
         IProject modPorject = CoreUtil.getProject( op.getProjectName().content() );