From 12e7e16ba9a2f2d140ee5632d754a636c3c384ec Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Fri, 7 Jul 2023 09:30:59 -0400
Subject: [PATCH] Attempt to trigger GHA builds properly

---
 .github/workflows/eclipse-ls-extensions-build.yml      | 10 +++++-----
 .../workflows/snapshot-e427-eclipse-distro-build.yml   |  8 +++++++-
 .../workflows/snapshot-e428-eclipse-distro-build.yml   |  8 +++++++-
 eclipse-distribution/pom.xml                           |  6 ------
 eclipse-language-servers/pom.xml                       |  4 ----
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 7a62a5180..2b95ea112 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -1,12 +1,12 @@
 name: Eclipse LS Extensions Snapshot Build
 
 # configure manual trigger
-on:
-  workflow_dispatch:
 #on:
-#  push:
-#    branches:
-#      - 'main'
+#  workflow_dispatch:
+on:
+  push:
+    branches:
+      - 'main'
 
 jobs:
 
diff --git a/.github/workflows/snapshot-e427-eclipse-distro-build.yml b/.github/workflows/snapshot-e427-eclipse-distro-build.yml
index 2175b5adf..97e14b5ca 100644
--- a/.github/workflows/snapshot-e427-eclipse-distro-build.yml
+++ b/.github/workflows/snapshot-e427-eclipse-distro-build.yml
@@ -1,7 +1,13 @@
 name: Snapshot - 4.27 Eclipse STS Distribution Build
 
+#on:
+#  workflow_dispatch:
 on:
-  workflow_dispatch:
+  workflow_run:
+    workflows: ["Eclipse LS Extensions Snapshot Build"]
+    types: [completed]
+    branches:
+      - "main"
 
 jobs:
   e427-distro:
diff --git a/.github/workflows/snapshot-e428-eclipse-distro-build.yml b/.github/workflows/snapshot-e428-eclipse-distro-build.yml
index 254799b25..ba298a6e8 100644
--- a/.github/workflows/snapshot-e428-eclipse-distro-build.yml
+++ b/.github/workflows/snapshot-e428-eclipse-distro-build.yml
@@ -1,7 +1,13 @@
 name: Snapshot - 4.28 Eclipse STS Distribution Build
 
+#on:
+#  workflow_dispatch:
 on:
-  workflow_dispatch:
+  workflow_run:
+    workflows: ["Eclipse LS Extensions Snapshot Build"]
+    types: [completed]
+    branches:
+      - "main"
 
 jobs:
   e428-distro:
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 9a971dc52..1b7fc6acc 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -142,14 +142,8 @@
 			<id>gitactions</id>
 			<properties>
 				<vm-signing.ssh.key>~/.ssh/id_rsa</vm-signing.ssh.key>
-
 				<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/sts4-language-server-integrations/trials</sts4-language-servers-p2-repo>
-
 				<gpg.passphrase>${env.gpg_passphrase}</gpg.passphrase>
 				<gpg.keyname>${env.gpg_keyname}</gpg.keyname>
 			</properties>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 03eda0b18..d53e9b66d 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -136,10 +136,6 @@
 			<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>
-
 				<gpg.passphrase>${env.gpg_passphrase}</gpg.passphrase>
 				<gpg.keyname>${env.gpg_keyname}</gpg.keyname>
 				<gpg.homedir>${env.gpg_homedir}</gpg.homedir>