From 57dce85969bd62ea622806f47d3e07b4d99faa49 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 6 Jul 2023 10:57:23 -0400
Subject: [PATCH] Test GHA e428 distro build

---
 .../current-eclipse-release-distro.yml        | 34 +++++++++++++++++++
 .../pom.xml                                   | 29 +++++++++-------
 eclipse-distribution/pom.xml                  | 10 ++++--
 3 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/current-eclipse-release-distro.yml

diff --git a/.github/workflows/current-eclipse-release-distro.yml b/.github/workflows/current-eclipse-release-distro.yml
new file mode 100644
index 000000000..1f4e3f988
--- /dev/null
+++ b/.github/workflows/current-eclipse-release-distro.yml
@@ -0,0 +1,34 @@
+name: Current Eclipse Release STS4 Distribution
+
+# configure manual trigger
+on:
+  workflow_dispatch:
+#on:
+#  push:
+#    branches:
+#      - 'main'
+
+jobs:
+
+  eclipse-language-servers-build:
+    runs-on: [self-hosted, macOS]
+    steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+      - name: Enforce https instead of http
+        run: ./nohttp.sh
+      - name: Timestamp
+        id: timestamp
+        run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%S')"
+      - name: Install GPG key
+        run: |
+          echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
+          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
+      - name: Build Eclipse Distro
+        env:
+          tools_s3_access_key: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
+          tools_s3_secret_key: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
+          gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          gpg_keyname: ${{ secrets.GPG_KEYID }}
+        run: |
+          cd eclipse-language-servers
+          xvfb-run ./mvnw --batch-mode -U clean deploy -Pe428 -Psnapshot -Pgitactions -Pgpg.sign -DbuildQualifier=${{ steps.timestamp.outputs.timestamp }} -Dsigning.skip=true -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Ds3service.https-only=true -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dskip.osx.signing=false  -Dskip.win.signing=false -Dskip.osx.notarizing=false -Dtycho.equinox.resolver.uses=true
\ No newline at end of file
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
index 7c852d30e..c463e645d 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -98,18 +98,6 @@
 				</configuration>
 			</plugin>
 
-<!--			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-gpg-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>sign-p2-artifacts</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin> -->
-
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-eclipserun-plugin</artifactId>
@@ -760,4 +748,21 @@
 			</plugins>
 		</pluginManagement> -->
 	</build>
+
+	<profiles>
+		<profile>
+			<id>gpg.sign</id>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-gpg-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>sign-p2-artifacts</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 245fe7736..2d9bc2da4 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -137,19 +137,23 @@
 				<sts4-language-servers-version>today</sts4-language-servers-version> <!-- this should be overridden in the build with the concrete ls version to include-->
 			</properties>
 		</profile>
-		
+
 		<profile>
 			<id>gitactions</id>
 			<properties>
 				<dist.accessKey>${env.tools_s3_access_key}</dist.accessKey>
 				<dist.secretKey>${env.tools_s3_secret_key}</dist.secretKey>
-				
+
 				<dist.pathpostfix>trials</dist.pathpostfix>
 				<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
-				<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/trials/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
+				<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/trials/sts4-language-server-integrations/trials/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
+
+				<gpg.passphrase>${env.gpg_passphrase}</gpg.passphrase>
+				<gpg.keyname>${env.gpg_keyname}</gpg.keyname>
 			</properties>
 		</profile>
 
+
 		<profile>
 			<id>vm-signing</id>
 			<build>