[GHA] Eclipse Distro builds

Author: BoykoAlex

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

@@ -103,8 +103,22 @@ jobs:
       - name: Store S3 Paths
         id: s3-paths
         run: |
-          dist_path=`cat ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/s3-dist-path.txt`
-          p2_path=`cat ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/s3-p2-repo-dist-path.txt`
+          eclipse_version=${eclipse_profile:0:2}.${eclipse_profile:2}
+          build_type=${{ inputs.build_type }}
+          if [[ "$build_type" == "snapshot" ]]; then
+            dist_path=${{ inputs.build_type }}/dist/$eclipse_version
+            p2_path=${{ inputs.build_type }}/update/$eclipse_version          
+          else
+            cd eclipse-distributions
+            version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+            version_segment="${version%%-*}"
+            p2_qualifier=${{ inputs.p2-qualifier }}
+            if ! [[ -z ${p2_qualifier} ]]; then
+              version_segment="${version_segment}.${p2_qualifier}
+            fi
+            dist_path=${{ inputs.build_type }}/dist/$version_segment/$eclipse_version
+            p2_path=${{ inputs.build_type }}/update/$version_segment/$eclipse_version          
+          fi
           echo "dist_path=$dist_path" >> $GITHUB_OUTPUT
           echo "p2_path=$p2_path" >> $GITHUB_OUTPUT
       - name: Upload P2 Repo Build Artifacts

eclipse-distribution/pom.xml

@@ -76,7 +76,7 @@
 		<dist.pathpostfix>nightly</dist.pathpostfix>
 		<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
 
-		<sts4-language-servers-p2-repo>https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts-language-servers-version}</sts4-language-servers-p2-repo>
+		<sts4-language-servers-p2-repo>https://cdn.spring.io/spring-tools/${dist.type}/language-server-integrations/${sts-language-servers-version}</sts4-language-servers-p2-repo>
 
 		<tycho-version>4.0.12</tycho-version>
 		<encoding>UTF-8</encoding>