From 96947665c16f16e9a9bf07c222b573723d48b668 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Mon, 31 Jul 2023 18:32:04 -0400
Subject: [PATCH] [GHA-Build] Store s3 dist folders in files to use by GHA

---
 .github/workflows/eclipse-ls-extensions-build.yml  | 11 +++++++++++
 .../pom.xml                                        |  3 +++
 .../pom.xml                                        |  3 +++
 .../pom.xml                                        |  3 +++
 .../pom.xml                                        | 14 ++++++++++++++
 5 files changed, 34 insertions(+)

diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 9ad3b71c6..a88543cb9 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -78,6 +78,17 @@ jobs:
           else
             ./mvnw --batch-mode clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dtycho.localArtifacts=ignore
           fi
+      - name:
+        if: ${{ inputs.build_type !== 'snapshot' }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
+          AWS_DEFAULT_REGION: us-east-1
+          CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
+          CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
+        run: |
+          dist_path=`cat ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/s3-p2-repo-dist-path.txt`
+          echo $dist_path
       - name: Verify Eclipse LS Extensions on e429
         run: |
           cd eclipse-language-servers
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
index 92a5195e2..12cc7f0a9 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
@@ -387,6 +387,9 @@
 								<echo file="${project.build.directory}/s3-dist-path.txt">
 									${dist.path.product}
 								</echo>
+								<echo file="${project.build.directory}/s3-p2-repo-dist-path.txt">
+									${dist.path.repo}
+								</echo>
 							</target>
 						</configuration>
 						<goals>
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 d02a5b0ee..d9f1ac3c3 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -375,6 +375,9 @@
 								<echo file="${project.build.directory}/s3-dist-path.txt">
 									${dist.path.product}
 								</echo>
+								<echo file="${project.build.directory}/s3-p2-repo-dist-path.txt">
+									${dist.path.repo}
+								</echo>
 							</target>
 						</configuration>
 						<goals>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
index 6b9b0902a..e39d98f81 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
@@ -388,6 +388,9 @@
 								<echo file="${project.build.directory}/s3-dist-path.txt">
 									${dist.path.product}
 								</echo>
+								<echo file="${project.build.directory}/s3-p2-repo-dist-path.txt">
+									${dist.path.repo}
+								</echo>
 							</target>
 						</configuration>
 						<goals>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
index 211488f5c..4c13ce83b 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
@@ -35,6 +35,20 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<version>1.6</version>
 				<executions>
+					<execution>
+						<id>generate-s3-upload-info</id>
+						<phase>verify</phase>
+						<configuration>
+							<target>
+								<echo file="${project.build.directory}/s3-p2-repo-dist-path.txt">
+									${dist.path}
+								</echo>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
 					<execution>
 						<id>upload-repo</id>
 						<phase>deploy</phase>