From e62a37a92805a596aeba42c3147cc6905a457f33 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 3 Sep 2024 00:46:13 +0200
Subject: [PATCH] [FIXUP]

---
 .github/workflows/checkVersions.yml | 25 +++++++------------------
 .github/workflows/ci.yml            |  2 +-
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/checkVersions.yml b/.github/workflows/checkVersions.yml
index 987259c9ebb..a4233244198 100644
--- a/.github/workflows/checkVersions.yml
+++ b/.github/workflows/checkVersions.yml
@@ -11,7 +11,7 @@ on:
         description: The name of the bot that adds the necessary version increment changes
         type: string
         required: true
-      excludedProject:
+      excludedProjects:
         description: The comma-separated list of projects that should not be skipped (e.g. products or repositories). Can speed-up the check
         type: string
         required: false
@@ -59,7 +59,7 @@ jobs:
 #            -Dcompare-version-with-baselines.skip=false
 #TODO: exclude products, p2-repos etc:
 # https://stackoverflow.com/questions/13266470/how-do-i-exclude-certain-modules-from-a-maven-build-using-the-commandline
-# Do something like -pl '!excludedProject.replace(',','!,')'
+# Do something like -pl '!excludedProjects.replace(',','!,')'
 # Or create a list of all eclipse-plugin and eclipse-feature projects and use it here as input for PL?! Could be done with java-script?!
 
 #TODO: Derive stream version from something
@@ -72,11 +72,15 @@ jobs:
           # Workspace is not clean, i.e. some version were changed
           echo "version-incremented=true" >> $GITHUB_OUTPUT
           
+          sudo apt-get install -qq -y libxml2-utils
+          streamVersion=$(xmllint --xpath '/project/properties/releaseName/text()' eclipse-platform-parent/pom.xml)
+          echo $streamVersion
+          
           git config --global user.email '${{ inputs.botMail }}'
           git config --global user.name '${{ inputs.botName }}'
           git add --all
           git status
-          git commit -m "Bump version(s) for 4.34 stream"
+          git commit -m "Bump version(s) for ${streamVersion} stream"
           
           fileList=$(git diff-tree --no-commit-id --name-only HEAD -r)
           echo "file-list<<EOF" >> $GITHUB_OUTPUT
@@ -98,21 +102,6 @@ jobs:
       env:
         BOT_TOKEN: ${{ secrets.githubBotPAT }}
 
-    - name: Push version bump commit
-      if: ${{ ! steps.git-commit.outputs.version-incremented }}
-      run: |
-        echo 'Inc: ${{ steps.git-commit.outputs.version-incremented }}'
-        echo 'full_name: ${{ github.event.pull_request.head.repo.full_name }}'
-        echo 'head-ref1: ${{ github.event.pull_request.head.ref }}'
-        echo 'head-ref2: ${{ github.head_ref }}'
-        git remote add 'fork' https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git
-        git remote -v
-        #git push 'fork' 'HEAD:refs/heads/${{ github.event.pull_request.head.ref }}'
-        git push \
-          'https://oauth2:${BOT_TOKEN}@github.com/${{ github.event.pull_request.head.repo.full_name }}.git' \
-          'HEAD:refs/heads/${{ github.event.pull_request.head.ref }}'
-      env:
-        BOT_TOKEN: ${{ secrets.githubBotPAT }}
 #TODO: Push it like in https://github.com/ad-m/github-push-action/blob/77c5b412c50b723d2a4fbc6d71fb5723bcd439aa/start.sh#L52
 #TODO: use an env-variable to pass the token?!
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d2e342543a..d64e629054e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,4 +23,4 @@ jobs:
       botName: Eclipse Releng Bot
       botMail: eclipse-releng-bot@eclipse.org
     secrets:
-      githubBotPAT: ${{ secrets.HANNESWELL_PAT }}
+      githubBotPAT: 'NOT_REALLY_SIGRID'