[CI] Simplify checkout and setup steps

* Also remove GE credentials for PR runs
spring-projects · Oct 7, 2023 · 21e837e · 21e837e
1 parent 3a76f16
commit 21e837e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 42 deletions.
diff --git a/.github/workflows/check-samples.yml b/.github/workflows/check-samples.yml
@@ -38,11 +38,7 @@ jobs:
     if: needs.prerequisites.outputs.runjobs
     steps:
       - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v2
-        with:
-          java-version: 17
-          distribution: temurin
+      - uses: spring-io/spring-gradle-build-action@v2
       - name: Check samples project
         env:
           LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -7,13 +7,6 @@ on:
       - '0.2.x'
     paths-ignore:
       - '.github/**'
-env:
-  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-  GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
-  GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
 
 jobs:
   build_and_verify:
@@ -22,11 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v2
-        with:
-          java-version: 17
-          distribution: temurin
+      - uses: spring-io/spring-gradle-build-action@v2
       - name: Build and run unit tests
         run: |
           ./gradlew clean build -x integrationTest --continue --scan

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,11 +46,7 @@ jobs:
     if: needs.prerequisites.outputs.runjobs
     steps:
       - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v2
-        with:
-          java-version: 17
-          distribution: temurin
+      - uses: spring-io/spring-gradle-build-action@v2
       - name: Build and run unit tests
         run: |
           ./gradlew clean build -x integrationTest \
@@ -73,11 +69,7 @@ jobs:
     if: needs.prerequisites.outputs.runjobs
     steps:
       - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v2
-        with:
-          java-version: 17
-          distribution: temurin
+      - uses: spring-io/spring-gradle-build-action@v2
       - name: Run all sample app tests
         env:
           LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
@@ -97,11 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v2
-        with:
-          java-version: 17
-          distribution: temurin
+      - uses: spring-io/spring-gradle-build-action@v2
       - name: Deploy artifacts
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -119,11 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v2
-        with:
-          java-version: 17
-          distribution: temurin
+      - uses: spring-io/spring-gradle-build-action@v2
       - name: Run Antora
         run: |
           ./gradlew antora
@@ -158,11 +142,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-      - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v2
-        with:
-          java-version: 17
-          distribution: temurin
+      - uses: spring-io/spring-gradle-build-action@v2
 
       - name: Wait for Artifactory artifacts (milestone)
         if: ${{ contains(needs.prerequisites.outputs.project_version, '-RC') || contains(needs.prerequisites.outputs.project_version, '-M') }}