further polish build definitions

Author: martinlippert

.github/workflows/gh-hosted-eclipse-distro-build.yml

@@ -121,14 +121,14 @@ jobs:
           echo "p2_path=$p2_path" >> $GITHUB_OUTPUT
       - name: Upload P2 Repo Build Artifacts
         run: |
-          cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target
+          cd eclipse-distribution/org.springframework.boot.ide.product/target
           p2_path=${{ steps.s3-paths.outputs.p2_path }}
           echo "P2 path: ${p2_path}"
           aws s3 rm s3://$AWS_S3_BUCKET/$p2_path/ --recursive
           aws s3 cp ./repository/ s3://$AWS_S3_BUCKET/$p2_path/ --recursive --no-progress
       - name: Upload Linux Distro Build Artifacts
         run: |
-          cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products
+          cd eclipse-distribution/org.springframework.boot.ide.product/target/products
           files=`ls spring-tools-for-eclipse*linux*.tar.gz`
           for file in $files
           do
@@ -161,7 +161,7 @@ jobs:
         run: |
           echo "Uploading Win Zips and OSX tar.gz to S3 for signing..."
           id=${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
-          aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products s3://$AWS_S3_BUCKET/sts-distro-ci-temp/$id --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
+          aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product/target/products s3://$AWS_S3_BUCKET/sts-distro-ci-temp/$id --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
     outputs:
       id: ${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
       dist_path: ${{ steps.s3-paths.outputs.dist_path }}

.github/workflows/release-eclipse-distro-build.yml

@@ -14,30 +14,30 @@ on:
 
 jobs:
 
-  e435-distro:
-    uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
-    with:
-      eclipse_profile: 'e435'
-      build_type: 'release'
-      p2-qualifier: 'RELEASE'
-      sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
-      java_version: '21'
-    secrets: inherit
+#  e435-distro:
+#    uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
+#    with:
+#      eclipse_profile: 'e435'
+#      build_type: 'release'
+#      p2-qualifier: 'RELEASE'
+#      sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
+#      java_version: '21'
+#    secrets: inherit
 
-  e436-distro:
+  e437-distro:
     uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
     with:
-      eclipse_profile: 'e436'
+      eclipse_profile: 'e437'
       build_type: 'release'
       p2-qualifier: 'RELEASE'
       sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
       java_version: '21'
     secrets: inherit
 
-  e437-distro:
+  e438-distro:
     uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
     with:
-      eclipse_profile: 'e437'
+      eclipse_profile: 'e438'
       build_type: 'release'
       p2-qualifier: 'RELEASE'
       sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}

eclipse-distribution/org.springframework.boot.ide.product.e437/category.xml renamed to eclipse-distribution/org.springframework.boot.ide.product/category.xml

@@ -205,7 +205,7 @@
 				</repository>
 			</repositories>
 			<modules>
-				<module>org.springframework.boot.ide.product.e437</module>
+				<module>org.springframework.boot.ide.product</module>
 			</modules>
 
 		</profile>
@@ -296,7 +296,7 @@
 				</repository>
 			</repositories>
 			<modules>
-				<module>org.springframework.boot.ide.product.e437</module>
+				<module>org.springframework.boot.ide.product</module>
 			</modules>
 
 		</profile>