From 1d65a0405049cfe325dc7cf02674b79b5459a1e1 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Fri, 14 Jul 2023 13:49:27 -0400
Subject: [PATCH] GHA: Cleanup. Attempt to correct s3 command

---
 .../workflows/eclipse-ls-extensions-build.yml |  4 +
 ...yml => gh-hosted-eclipse-distro-build.yml} | 11 ++-
 ...l => self-hosted-eclipse-distro-build.yml} |  0
 .../snapshot-e427-eclipse-distro-build.yml    |  2 +-
 .../snapshot-e428-eclipse-distro-build.yml    |  2 +-
 .../snapshot-e429-eclipse-distro-build.yml    |  7 +-
 .../pom.xml                                   | 95 +++++++++++++++++--
 7 files changed, 104 insertions(+), 17 deletions(-)
 rename .github/workflows/{experimental-eclipse-distro-build.yml => gh-hosted-eclipse-distro-build.yml} (90%)
 rename .github/workflows/{eclipse-distro-build.yml => self-hosted-eclipse-distro-build.yml} (100%)

diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 7a62a5180..a7e2d7a3e 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -14,6 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+        with
+        sparse-checkout: |
+          headless-services
+          eclipse-language-servers
       - name: Set up JDK 17
         uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
         with:
diff --git a/.github/workflows/experimental-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
similarity index 90%
rename from .github/workflows/experimental-eclipse-distro-build.yml
rename to .github/workflows/gh-hosted-eclipse-distro-build.yml
index 6b64a58d1..fc703c8e8 100644
--- a/.github/workflows/experimental-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -27,6 +27,9 @@ jobs:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           ref: ${{ inputs.ref }}
+          sparse-checkout: |
+            eclipse-distribution
+            eclipse-extensions
       - name: Set up JDK 17
         uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
         with:
@@ -127,9 +130,9 @@ jobs:
           dist_path=`cat s3-dist-path.txt`
           
           ls spring-tool-suite-4*win*.zip*
-          aws s3 rm s3://dist.springsource.com/${dist_path} --exclude "*" --include "spring-tool-suite-4*win*.zip*"
-          aws s3 cp s3://dist.springsource.com/${dist_path} . --exclude "*" --include "spring-tool-suite-4*win*.zip*"
+          aws s3 rm s3://dist.springsource.com/${dist_path}/ --exclude "*" --include "spring-tool-suite-4*win*.zip*"
+          aws s3 cp s3://dist.springsource.com/${dist_path}/ . --exclude "*" --include "spring-tool-suite-4*win*.zip*" --acl public-read
           
           ls spring-tool-suite-4*win*.jar*
-          aws s3 rm s3://dist.springsource.com/${dist_path} --exclude "*" --include "spring-tool-suite-4*win*.jar*" 
-          aws s3 cp s3://dist.springsource.com/${dist_path} . --exclude "*" --include "spring-tool-suite-4*win*.jar*"
+          aws s3 rm s3://dist.springsource.com/${dist_path}/ --exclude "*" --include "spring-tool-suite-4*win*.jar*"
+          aws s3 cp s3://dist.springsource.com/${dist_path}/ . --exclude "*" --include "spring-tool-suite-4*win*.jar*" --acl public-read
diff --git a/.github/workflows/eclipse-distro-build.yml b/.github/workflows/self-hosted-eclipse-distro-build.yml
similarity index 100%
rename from .github/workflows/eclipse-distro-build.yml
rename to .github/workflows/self-hosted-eclipse-distro-build.yml
diff --git a/.github/workflows/snapshot-e427-eclipse-distro-build.yml b/.github/workflows/snapshot-e427-eclipse-distro-build.yml
index b2d510674..477b548e1 100644
--- a/.github/workflows/snapshot-e427-eclipse-distro-build.yml
+++ b/.github/workflows/snapshot-e427-eclipse-distro-build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   e427-distro:
 #    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/eclipse-distro-build.yml
+    uses: ./.github/workflows/self-hosted-eclipse-distro-build.yml
     with:
       eclipse_profile: 'e427'
       build_type: 'snapshot'
diff --git a/.github/workflows/snapshot-e428-eclipse-distro-build.yml b/.github/workflows/snapshot-e428-eclipse-distro-build.yml
index 96335460a..1bff5a861 100644
--- a/.github/workflows/snapshot-e428-eclipse-distro-build.yml
+++ b/.github/workflows/snapshot-e428-eclipse-distro-build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   e428-distro:
 #    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/eclipse-distro-build.yml
+    uses: ./.github/workflows/self-hosted-eclipse-distro-build.yml
     with:
       eclipse_profile: 'e428'
       build_type: 'snapshot'
diff --git a/.github/workflows/snapshot-e429-eclipse-distro-build.yml b/.github/workflows/snapshot-e429-eclipse-distro-build.yml
index e0fe301e3..ec95e5c74 100644
--- a/.github/workflows/snapshot-e429-eclipse-distro-build.yml
+++ b/.github/workflows/snapshot-e429-eclipse-distro-build.yml
@@ -5,12 +5,17 @@ concurrency:
   cancel-in-progress: true
 
 on:
+  workflow_run:
+    workflows: ["Eclipse LS Extensions Snapshot Build"]
+    types: [completed]
+    branches:
+      - "main"
   workflow_dispatch:
 
 jobs:
   e429-distro:
 #    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/eclipse-distro-build.yml
+    uses: ./.github/workflows/self-hosted-eclipse-distro-build.yml
     with:
       eclipse_profile: 'e429'
       build_type: 'snapshot'
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 c92a371db..a5c9ad0c8 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
@@ -516,20 +516,64 @@
 								<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
 								<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
 
+								<exec executable="xcrun" failonerror="true">
+									<arg value="notarytool" />
+									<arg value="store-credentials" />
+									<arg value="notarize-app-dmg-profile" />
+									<arg value="--apple-id" />
+									<arg value="${env.AC_USERNAME}" />
+									<arg value="--team-id" />
+									<arg value="${env.APPLE_TEAM_ID}" />
+									<arg value="--password" />
+									<arg value="${env.AC_PASSWORD}" />
+								</exec>
+
 								<parallel failonany="true">
-
-									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">
+									<exec executable="xcrun" failonerror="true">
+										<arg value="notarytool" />
+										<arg value="submit" />
 										<arg value="${dmgName}" />
-										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
+										<arg value="--keychain-profile" />
+										<arg value="notarize-app-dmg-profile" />
+										<arg value="--wait" />
 									</exec>
-
-									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">
+									<exec executable="xcrun" failonerror="true">
+										<arg value="notarytool" />
+										<arg value="submit" />
 										<arg value="${dmgName-aarch64}" />
-										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
+										<arg value="--keychain-profile" />
+										<arg value="notarize-app-dmg-profile" />
+										<arg value="--wait" />
 									</exec>
-
 								</parallel>
 
+								<parallel failonany="true">
+									<exec executable="xcrun" failonerror="true">
+										<arg value="stapler" />
+										<arg value="staple" />
+										<arg value="${dmgName}" />
+									</exec>
+									<exec executable="xcrun" failonerror="true">
+										<arg value="stapler" />
+										<arg value="staple" />
+										<arg value="${dmgName-aarch64}" />
+									</exec>
+								</parallel>
+
+<!--								<parallel failonany="true">-->
+
+<!--									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
+<!--										<arg value="${dmgName}" />-->
+<!--										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
+<!--									</exec>-->
+
+<!--									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
+<!--										<arg value="${dmgName-aarch64}" />-->
+<!--										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
+<!--									</exec>-->
+
+<!--								</parallel>-->
+
 							</target>
 						</configuration>
 						<goals>
@@ -611,7 +655,7 @@
 
 					<execution>
 						<id>update-nightly-downloads</id>
-						<phase>deploy</phase>
+						<phase>verify</phase>
 						<configuration>
 							<skip>${skip.update-nightly-download-page}</skip>
 							<target>
@@ -619,14 +663,30 @@
 								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
 
 								<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
-		
+
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
 
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>upload-nightly-downloads</id>
+						<phase>deploy</phase>
+						<configuration>
+							<skip>${skip.update-nightly-download-page}</skip>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
 									<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
-										toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
+											toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
 									</upload>
 								</s3>
 							</target>
@@ -636,6 +696,21 @@
 						</goals>
 					</execution>
 
+					<execution>
+						<id>generate-s3-upload-info</id>
+						<phase>verify</phase>
+						<configuration>
+							<target>
+								<echo file="${project.build.directory}/s3-dist-path.txt">
+									${dist.path.product}
+								</echo>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
 					<execution>
 						<id>zip-sts-repository</id>
 						<phase>install</phase>