👷 ci: Restore version 5.2.0 in actions to work with Java 11 to pass C…

…I for release, update lockfile in release action, use Java 17 in action.yml (#1036) Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
chains-project · Dec 19, 2024 · 5afa45f · 5afa45f
1 parent 99fbd4e
commit 5afa45f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/.github/workflows/Lockfile.yml b/.github/workflows/Lockfile.yml
@@ -26,7 +26,7 @@ jobs:
             sh.jbang.dev:443
 
       - name: run maven-lockfile
-        uses: chains-project/maven-lockfile@611060d93984a0a72c1c895eab39c13b09852d4c # v5.3.0
+        uses: chains-project/maven-lockfile@526cd67327ab19c7bd95be6d2d16530d80bf3c9e # v5.2.0
         with:
           github-token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           include-maven-plugins: true
diff --git a/.github/workflows/LockfilePR.yml b/.github/workflows/LockfilePR.yml
@@ -25,14 +25,14 @@ jobs:
 
       - name: run maven-lockfile
         if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-        uses: chains-project/maven-lockfile@611060d93984a0a72c1c895eab39c13b09852d4c # v5.3.0
+        uses: chains-project/maven-lockfile@526cd67327ab19c7bd95be6d2d16530d80bf3c9e # v5.2.0
         with:
           github-token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           include-maven-plugins: true
 
       - name: run maven-lockfile (fork/external)
         if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
-        uses: chains-project/maven-lockfile@611060d93984a0a72c1c895eab39c13b09852d4c # v5.3.0
+        uses: chains-project/maven-lockfile@526cd67327ab19c7bd95be6d2d16530d80bf3c9e # v5.2.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           include-maven-plugins: true

diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml
@@ -38,6 +38,9 @@ jobs:
         uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
         with:
           maven-version: 3.9.6
+      - id: install-jbang
+        run: curl -Ls https://sh.jbang.dev | bash -s - app setup
+        shell: bash
       - name: Set git user
         run: |
           git config --global user.name "GitHub Actions Bot"
@@ -62,8 +65,8 @@ jobs:
         # semver next for a snapshot only releases the snapshot version, so we need to run it 2 times
         if: ${{ github.event.inputs.version == 'major'  || github.event.inputs.version == 'minor' }}
         run: echo "NEXT_VERSION=$(semver next ${{ github.event.inputs.version }} $CURRENT_VERSION)" >> $GITHUB_ENV
-      - name: run maven-lockfile
-        uses: chains-project/maven-lockfile@611060d93984a0a72c1c895eab39c13b09852d4c # v5.3.0
+      - name: run maven-lockfile (validate lockfile)
+        uses: chains-project/maven-lockfile@526cd67327ab19c7bd95be6d2d16530d80bf3c9e # v5.2.0
         with:
             github-token: ${{ secrets.GITHUB_TOKEN }}
             include-maven-plugins: true
@@ -74,6 +77,12 @@ jobs:
         run: mvn --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_VERSION -DprocessAllModules
       - name: Generate Readme
         run : mvn generate-resources resources:copy-resources
+      - name: run maven-lockfile (generate new lockfile for release version)
+        env:
+          POM_CHANGED: true # the version has changed, new lockfile is needed
+          COMMIT_UPDATED_LOCKFILE: true
+        run: ~/.jbang/bin/jbang --repos 'mavencentral' io.github.chains-project:maven-lockfile-github-action:5.2.0
+        bash: shell
       - name: commit changes
         run: |
           git checkout -b ${{ env.BRANCH_NAME }}
@@ -120,6 +129,12 @@ jobs:
 #1 Readme and action.yml
       - name: Generate Readme
         run : mvn generate-resources resources:copy-resources -q
+      - name: run maven-lockfile (generate new lockfile for -SNAPSHOT version)
+        env:
+          POM_CHANGED: true # the version has changed, new lockfile is needed
+          COMMIT_UPDATED_LOCKFILE: true
+        run: ~/.jbang/bin/jbang --repos 'mavencentral' io.github.chains-project:maven-lockfile-github-action:5.2.0
+        bash: shell
 # Commit and push changes
       - name: Commit & Push changes
         run: |

diff --git a/.github/workflows/regenerate-lockfile.yml b/.github/workflows/regenerate-lockfile.yml
@@ -24,6 +24,6 @@ jobs:
             sh.jbang.dev:443
 
       - name: run maven-lockfile
-        uses: chains-project/maven-lockfile@611060d93984a0a72c1c895eab39c13b09852d4c # v5.3.0
+        uses: chains-project/maven-lockfile@526cd67327ab19c7bd95be6d2d16530d80bf3c9e # v5.2.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/github_action/lockfile.json b/github_action/lockfile.json
@@ -7046,7 +7046,7 @@
     "environment": {
       "osName": "Linux",
       "mavenVersion": "3.8.2",
-      "javaVersion": "11.0.25"
+      "javaVersion": "17.0.13"
     },
     "config": {
       "includeMavenPlugins": true,

diff --git a/lockfile.json b/lockfile.json
@@ -108,7 +108,7 @@
     "environment": {
       "osName": "Linux",
       "mavenVersion": "3.8.2",
-      "javaVersion": "11.0.25"
+      "javaVersion": "17.0.13"
     },
     "config": {
       "includeMavenPlugins": true,

diff --git a/maven_plugin/lockfile.json b/maven_plugin/lockfile.json
@@ -2429,7 +2429,7 @@
     "environment": {
       "osName": "Linux",
       "mavenVersion": "3.8.2",
-      "javaVersion": "11.0.25"
+      "javaVersion": "17.0.13"
     },
     "config": {
       "includeMavenPlugins": true,