refresh dependencies

enonic · May 14, 2024 · f8084aa · f8084aa
1 parent 7954dee
commit f8084aa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -31,32 +31,32 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
+          distribution: temurin
           java-version: 11
-          distribution: 'temurin'
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Prepare Gradle Arguments
+        run: |
+          BASE_ARGS="--refresh-dependencies build"
+          PUBLISH_ARGS="publish -Pcom.enonic.xp.app.production=true -PrepoKey=${{ needs.publish_vars.outputs.repo }} -PrepoUser=ci -PrepoPassword=${{ secrets.ARTIFACTORY_PASSWORD }}"
+          if [ "${{ needs.publish_vars.outputs.publish }}" == "true" ]; then
+            GRADLE_ARGS="$BASE_ARGS $PUBLISH_ARGS"
+          else
+            GRADLE_ARGS="$BASE_ARGS"
+          fi
+          echo "GRADLE_ARGS=$GRADLE_ARGS" >> $GITHUB_ENV
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew $GRADLE_ARGS
 
       - uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
-      - name: Publish
-        if: needs.publish_vars.outputs.publish == 'true'
-        run: ./gradlew publish -PrepoKey=${{ needs.publish_vars.outputs.repo }} -PrepoUser=ci -PrepoPassword=${{ secrets.ARTIFACTORY_PASSWORD }}
-
   dispatch:
     needs: [ publish_vars, build ]
     strategy:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,12 +43,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
+          distribution: temurin
           java-version: 11
-          distribution: 'temurin'
-          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Get publishing variables
         id: publish_vars