Prepare workflows for M and RC builds

.github/workflows/announce-release.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: Release version (i.e. 4.20.1)
+        description: Release version (i.e. 4.20.1, 4.32.1.RELEASE, 4.22.1.M3)
         required: true
         type: string
 

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

@@ -111,6 +111,7 @@ jobs:
             p2_path=${{ inputs.build_type }}/update/$eclipse_version          
           else
             p2_qualifier=${{ inputs.p2-qualifier }}
+            version_segment=${{ steps.project-version.outputs.version }}
             if ! [[ -z ${p2_qualifier} ]]; then
               version_segment=${{ steps.project-version.outputs.version }}.$p2_qualifier
             fi
@@ -377,9 +378,14 @@ jobs:
           rm -f ./$downloads_html
 
           build_type=${{ inputs.build_type }}
-          build_type=${build_type^}
           eclipse_profile=${{ inputs.eclipse_profile }}
           eclipse_version=${eclipse_profile:1:1}.${eclipse_profile:2}
+          p2_qualifier=${{ inputs.p2-qualifier }}
+          version_segment=${{ steps.project-version.outputs.version }}
+          if ! [[ -z ${p2_qualifier} ]]; then
+            version_segment=${{ steps.project-version.outputs.version }}.$p2_qualifier
+          fi
+
 
           curl --location --request POST '${{ secrets.TOOLS_TEAM_GCHAT_WEBHOOK_URL }}' \
           --header 'Content-Type: application/json' \
@@ -388,7 +394,7 @@ jobs:
                   {
                     \"card\": {
                       \"header\": {
-                        \"title\": \"STS ${{ needs.eclipse-distro-build.outputs.version }} ${build_type}\",
+                        \"title\": \"STS ${version_segment} ${build_type}\",
                         \"subtitle\": \"Eclipse ${eclipse_version}\",
                         \"imageUrl\": \"https://avatars.githubusercontent.com/u/317776?s=48&v=4\",
                       },

.github/workflows/publish-eclipse-release.yml

@@ -15,6 +15,11 @@ on:
         description: Release version (i.e. 4.20.1)
         required: true
         type: string
+      qualifier:
+        default: "RELEASE"
+        description: "The version qualifier, i.e. `RELEASE` (default), RC1, M2"
+        required: true
+        type: string
       eclipse_latest:
         description: Latest eclipse release version (i.e. e4.30)
         required: true
@@ -34,21 +39,21 @@ jobs:
   aggregate-distro-update-site:
     uses: ./.github/workflows/aggregate-distro-update-sites.yml
     with:
-      version: ${{ inputs.release_version }}.RELEASE
+      version: ${{ inputs.release_version }}.${{ inputs.qualifier }}
       latest: ${{ inputs.eclipse_latest }}
     secrets: inherit
 
   backup-release-on-gcp:
     uses: ./.github/workflows/backup-eclipse-releases-to-gcp.yml
     with:
       ls_version: ${{ inputs.ls_version }}
-      release_version: ${{ inputs.release_version }}.RELEASE
+      release_version: ${{ inputs.release_version }}.${{ inputs.qualifier }}
     secrets: inherit
 
   create-github-release:
     uses: ./.github/workflows/create-gh-release.yml
     with:
-      version: ${{ inputs.release_version }}.RELEASE
+      version: ${{ inputs.release_version }}.${{ inputs.qualifier }}
     secrets: inherit
 
 #  announce-release:

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

@@ -7,10 +7,15 @@ concurrency:
 on:
   workflow_dispatch:
     inputs:
-      sts4-language-servers-version:
+      sts-language-servers-version:
         description: Last segments of an s3 path for p2 Repo for eclipse ls extensions
         required: true
         type: string
+      qualifier:
+        default: "RELEASE"
+        description: "The version qualifier, i.e. `RELEASE` (default), RC1, M2"
+        required: true
+        type: string
 
 jobs:
 
@@ -20,27 +25,27 @@ jobs:
 #      eclipse_profile: 'e435'
 #      build_type: 'release'
 #      p2-qualifier: 'RELEASE'
-#      sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
+#      sts-language-servers-version: ${{ inputs.sts-language-servers-version }}
 #      java_version: '21'
 #    secrets: inherit
 
-  e437-distro:
-    uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
-    with:
-      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:
+#    uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
+#    with:
+#      eclipse_profile: 'e437'
+#      build_type: 'release'
+#      p2-qualifier: ${{ inputs.qualifier }}
+#      sts-language-servers-version: ${{ inputs.sts-language-servers-version }}
+#      java_version: '21'
+#    secrets: inherit
 
   e438-distro:
     uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
     with:
       eclipse_profile: 'e438'
       build_type: 'release'
-      p2-qualifier: 'RELEASE'
-      sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
+      p2-qualifier: ${{ inputs.qualifier }}
+      sts-language-servers-version: ${{ inputs.sts-language-servers-version }}
       java_version: '21'
     secrets: inherit
 

.github/workflows/release-eclipse-ls-extensions.yml

@@ -7,7 +7,7 @@ concurrency:
 on:
   workflow_dispatch:
     inputs:
-      sts4-language-servers-version:
+      sts-language-servers-version:
         description: Last segments of an s3 path for p2 Repo for eclipse ls extensions
         required: true
         type: string
@@ -17,8 +17,8 @@ jobs:
   eclipse-ls-extension:
     uses: ./.github/workflows/eclipse-ls-extensions-build.yml
     with:
-      eclipse_profile: 'e435'
+      eclipse_profile: 'e437'
       build_type: 'release'
       skip_tests: true
-      sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
+      sts-language-servers-version: ${{ inputs.sts-language-servers-version }}
     secrets: inherit