build(deps): bump gradle/actions from 3.3.0 to 3.3.1 (#800)

* build(deps): bump gradle/actions from 3.3.0 to 3.3.1 Bumps [gradle/actions](https://github.com/gradle/actions) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](gradle/actions@6cec5d4...750cdda) --- updated-dependencies: - dependency-name: gradle/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * moved gradle validation action to gradle setup modified release process to add run number Signed-off-by: Stephane Bouchet <[email protected]> * fix publish to marketplace skip test Signed-off-by: Stephane Bouchet <[email protected]> * fix upload asset Signed-off-by: Stephane Bouchet <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Stephane Bouchet <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephane Bouchet <[email protected]> Co-authored-by: Andre Dietisheim <[email protected]>
redhat-developer · May 7, 2024 · 167f175 · 167f175
1 parent 397cb1b
commit 167f175
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,7 +68,11 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 #v3.3.0
+        uses: gradle/actions/setup-gradle@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c #v3.3.1
+        with:
+          add-job-summary: 'on-failure'
+          add-job-summary-as-pr-comment: 'on-failure'
+          validate-wrappers: true
       - uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced #v1.9.0
         name: Start cluster
         with:

diff --git a/.github/workflows/integration_ui_tests.yml b/.github/workflows/integration_ui_tests.yml
@@ -16,7 +16,11 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 #v3.3.0
+        uses: gradle/actions/setup-gradle@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c #v3.3.1
+        with:
+          add-job-summary: 'on-failure'
+          add-job-summary-as-pr-comment: 'on-failure'
+          validate-wrappers: true
       - uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced #v1.9.0
         name: Start cluster
         with:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -12,8 +12,6 @@ jobs:
     steps:
       - name: Fetch Sources
         uses: actions/checkout@v4
-      - name: validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 #v3.3.0
       - run: |
           git rev-parse HEAD >> lastCommit
       - name: Check New Changes
@@ -46,8 +44,11 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 #v3.3.0
+        uses: gradle/actions/setup-gradle@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c #v3.3.1
         with:
+          add-job-summary: 'on-failure'
+          add-job-summary-as-pr-comment: 'on-failure'
+          validate-wrappers: true
           gradle-home-cache-cleanup: true
 
       - name: Publish Plugin

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,5 @@
 name: Release Plugin
+run-name: Release ${{ inputs.release_version }}
 
 #Only one job at a time
 concurrency: release
@@ -14,12 +15,15 @@ on:
           - 'true'
           - 'false'
         default: 'false'
+      release_version:
+        description: 'Release version'
+        required: true
+        type: string
 
 jobs:
   # Prepare and publish the plugin to JetBrains Marketplace repository
   release:
-    if: ${{ inputs.publishToMarketPlace == 'true' }}
-    name: Publish to Marketplace
+    name: Publish new release
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -29,10 +33,6 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v4
 
-      # Validate Wrapper before running build
-      - name: validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 #v3.3.0
-
       # Set up Java environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -42,21 +42,25 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 #v3.3.0
+        uses: gradle/actions/setup-gradle@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c #v3.3.1
         with:
+          add-job-summary: 'on-failure'
+          add-job-summary-as-pr-comment: 'on-failure'
+          validate-wrappers: true
           gradle-home-cache-cleanup: true
 
       - name: Set Release Version
         shell: bash
         run: |
           CURRENT_VERSION=$(grep "projectVersion=" gradle.properties | cut -d'=' -f2)
-          NEW_VERSION=${CURRENT_VERSION%-SNAPSHOT}
+          NEW_VERSION=${{ inputs.release_version }}.${{ github.run_number }}
           awk -v current="$CURRENT_VERSION" -v new="$NEW_VERSION" 'BEGIN {FS=OFS="="} $1 == "projectVersion" { $2 = new }1' gradle.properties > tmpfile && mv tmpfile gradle.properties
           echo "Release version: $NEW_VERSION"
           echo "PLUGIN_VERSION=${NEW_VERSION}" >> $GITHUB_ENV
 
       # Publish the plugin to JetBrains Marketplace
       - name: Publish Plugin to JetBrains Marketplace
+        if: ${{ inputs.publishToMarketPlace == 'true' }}
         env:
           PUBLISH_TOKEN: ${{ secrets.JETBRAINS_MARKETPLACE_TOKEN }}
         run: |
@@ -72,10 +76,10 @@ jobs:
           if git diff --quiet; then
             echo "No changes to commit."
           else
-            git commit -sam "chore(skip-release): set version to $PLUGIN_VERSION"
+            git commit -sam "chore(skip-release): set version to ${{ inputs.release_version }}"
           fi
-          git tag $PLUGIN_VERSION
-          git push origin $PLUGIN_VERSION
+          git tag ${{ inputs.release_version }}
+          git push origin ${{ inputs.release_version }}
 
       # Set next SNAPSHOT version
       - name: Increment Plugin Version
@@ -100,22 +104,23 @@ jobs:
         id: changelog
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          current-tag: ${{env.PLUGIN_VERSION}}
+          current-tag: ${{ inputs.release_version }}
           types-mapping: 'feat:Features,fix:Bug Fixes,docs:Documentation,refactor:Refactoring,build:Builds,chore:Other'
 
       # Create a new Github release
       - name: Create Github Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release create ${PLUGIN_VERSION} \
-            --title "${PLUGIN_VERSION}" \
+          gh release create ${{ inputs.release_version }} \
+            --title "${{ inputs.release_version }}" \
             --notes "$(cat << 'EOM'
           ${{ steps.changelog.outputs.changelog }}
           EOM
           )"
 
       - name: Upload Release Asset
+        if: ${{ inputs.publishToMarketPlace == 'true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${PLUGIN_VERSION} ./build/distributions/*
+        run: gh release upload ${{ inputs.release_version }} ./build/distributions/*