From a733935ef185f2acefbf0d1d543991294acbf9ee Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 7 Dec 2023 15:44:19 -0500 Subject: [PATCH] Rework verify staging WF for Gradle init script **Cherry-pick to `6.1.x`** --- .github/workflows/verify-staged-artifacts.yml | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/verify-staged-artifacts.yml b/.github/workflows/verify-staged-artifacts.yml index 64b3835b41..57a5f3e07b 100644 --- a/.github/workflows/verify-staged-artifacts.yml +++ b/.github/workflows/verify-staged-artifacts.yml @@ -12,7 +12,6 @@ env: GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} - JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} jobs: verify-staged-with-samples: @@ -26,19 +25,15 @@ jobs: ref: ${{ github.ref_name }} show-progress: false - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 17 - cache: 'gradle' - - - uses: jfrog/setup-jfrog-cli@v3 - - - name: Configure JFrog Cli - run: jf gradlec --repo-resolve libs-staging-local + - name: Set up Gradle + uses: spring-io/spring-gradle-build-action@v2 - name: Verify Spring Integration Samples against staged release run: | + echo 'allprojects { + repositories { + maven { url "https://repo.spring.io/libs-staging-local" } + } + }' > staging-repo-init.gradle sed -i "1,/springIntegrationVersion.*/s/springIntegrationVersion.*/springIntegrationVersion='${{ inputs.releaseVersion }}'/" build.gradle - jf gradle check + jf gradle check --init-script staging-repo-init.gradle