Skip to content

Commit 708dbb5

Browse files
committed
Use Gradle init script for Artifactory in verify-staged-artifacts
The JFrog CLI does not resolve artifacts properly: only provided `--repo-resolve` is in use # Conflicts: # .github/workflows/verify-staged-artifacts.yml
1 parent f968c34 commit 708dbb5

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

.github/workflows/verify-staged-artifacts.yml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ on:
88
required: true
99
type: string
1010

11+
env:
12+
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
13+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
14+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
15+
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
16+
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
17+
1118
jobs:
1219
verify-staged-with-samples:
1320
runs-on: ubuntu-latest
@@ -20,24 +27,27 @@ jobs:
2027
ref: 6.1.x
2128
show-progress: false
2229

23-
- name: Set up JDK
24-
uses: actions/setup-java@v3
25-
with:
26-
distribution: temurin
27-
java-version: 17
28-
cache: 'gradle'
29-
30-
- uses: jfrog/setup-jfrog-cli@v3
31-
env:
32-
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
33-
34-
- name: Configure JFrog Cli
35-
run: jf gradlec --repo-resolve libs-staging-local
30+
- name: Set up Gradle
31+
uses: spring-io/spring-gradle-build-action@v2
3632

37-
- name: Verify Spring Integration Kafka against staged release
33+
- name: Prepare Spring Integration project against Staging
3834
run: |
39-
sed -i "1,/springKafkaVersion.*/s/springKafkaVersion.*/springKafkaVersion='${{ inputs.releaseVersion }}'/" build.gradle
40-
jf gradle :spring-integration-kafka:check
35+
printf "allprojects {
36+
repositories {
37+
maven {
38+
url 'https://repo.spring.io/libs-staging-local'
39+
credentials {
40+
username = '$ARTIFACTORY_USERNAME'
41+
password = '$ARTIFACTORY_PASSWORD'
42+
}
43+
}
44+
}
45+
}" > staging-repo-init.gradle
46+
47+
sed -i "1,/springKafkaVersion.*/s/springKafkaVersion.*/springKafkaVersion='${{ inputs.releaseVersion }}'/" build.gradle
48+
49+
- name: Verify Spring Integration Kafka module against staged release
50+
run: gradle :spring-integration-kafka:check --init-script staging-repo-init.gradle
4151

4252
- name: Capture Test Results
4353
if: failure()

0 commit comments

Comments
 (0)