upgrade setup-gradle tasks (#92)

moderneinc · Aug 19, 2024 · 672e382 · 672e382
1 parent 415d9e9
commit 672e382
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/.github/workflows/ci-gradle-nexus.yml b/.github/workflows/ci-gradle-nexus.yml
@@ -91,16 +91,18 @@ jobs:
         run: gu install ${{ inputs.install_graal_languages }}
       ########################
 
-      - name: build
+      - name: setup gradle
         uses: gradle/actions/setup-gradle@v4
-        with:
-          arguments: ${{ env.GRADLE_SWITCHES }} build
+      - name: build
+        run: ./gradlew ${{ env.GRADLE_SWITCHES }} build
+
 
       - name: publish-snapshots
         if: inputs.publish_snapshots && github.event_name != 'pull_request' && github.repository_owner == 'moderneinc'
         uses: gradle/actions/setup-gradle@v4
-        with:
-          arguments: ${{ env.GRADLE_SWITCHES }} snapshot publish -PforceSigning -x test
+      - name: build
+        if: inputs.publish_snapshots && github.event_name != 'pull_request' && github.repository_owner == 'moderneinc'
+        run: ./gradlew ${{ env.GRADLE_SWITCHES }} snapshot publish -PforceSigning -x test
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.ossrh_username }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.ossrh_token }}

diff --git a/.github/workflows/ci-gradle.yml b/.github/workflows/ci-gradle.yml
@@ -68,10 +68,10 @@ jobs:
           distribution: temurin
           java-version: ${{ inputs.java_version }}
 
-      - name: build
+      - name: setup gradle
         uses: gradle/actions/setup-gradle@v4
-        with:
-          arguments: ${{ env.GRADLE_SWITCHES }} build
+      - name: build
+        run: ./gradlew ${{ env.GRADLE_SWITCHES }} build
 
       - name: publish-tests
         uses: EnricoMi/publish-unit-test-result-action@v2

diff --git a/.github/workflows/publish-containerized-gradle-app.yml b/.github/workflows/publish-containerized-gradle-app.yml
@@ -60,16 +60,17 @@ jobs:
           rm -rf /opt/hostedtoolcache/go
           rm -rf /opt/hostedtoolcache/node
 
-      - name: build, tag, and push docker image
+      - name: set up gradle
         uses: gradle/actions/setup-gradle@v4
+      - name: build, tag, and push docker image
         env:
           TESTCONTAINERS_RYUK_DISABLED: true
           GRGIT_USER: ${{ github.actor }}
           GRGIT_PASS: ${{ secrets.GITHUB_TOKEN }}
           MODERNE_ARTIFACTORY_USERNAME: ${{ secrets.moderne_artifactory_username }}
           MODERNE_ARTIFACTORY_PASSWORD: ${{ secrets.moderne_artifactory_password }}
-        with:
-          arguments: ${{ env.GRADLE_SWITCHES }} -Prelease.scope=${{ inputs.release_scope }} final -x test
+        run: ./gradlew ${{ env.GRADLE_SWITCHES }} -Prelease.scope=${{ inputs.release_scope }} final -x test
+
 
       - name: Send notification on error
         if: ${{ failure() }}

diff --git a/.github/workflows/publish-maven-central.yml b/.github/workflows/publish-maven-central.yml
@@ -61,28 +61,29 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - name: setup gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: publish-candidate
         if: contains(github.ref, '-rc.')
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          arguments: |
-            ${{ env.GRADLE_SWITCHES }}
-            -Preleasing
-            -Prelease.disableGitChecks=true
-            -Prelease.useLastTag=true
-            candidate
-            publish
+        run: |
+            ./gradlew  \
+            ${{ env.GRADLE_SWITCHES }} \
+            -Preleasing \
+            -Prelease.disableGitChecks=true \
+            -Prelease.useLastTag=true \
+            candidate \
+            publish \
             closeAndReleaseSonatypeStagingRepository
 
       - name: publish-release
         if: (!contains(github.ref, '-rc.'))
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          arguments: |
-            ${{ env.GRADLE_SWITCHES }}
-            -Preleasing
-            -Prelease.disableGitChecks=true
-            -Prelease.useLastTag=true
-            final
-            publish
+        run: |
+            ./gradlew \
+            ${{ env.GRADLE_SWITCHES }} \
+            -Preleasing \
+            -Prelease.disableGitChecks=true \
+            -Prelease.useLastTag=true \
+            final \
+            publish \
             closeAndReleaseSonatypeStagingRepository