Skip to content

Commit eb68d6d

Browse files
committed
Fix verify-staged for Artifactory
The JFrog CLI does not add `--repo-resolve` to Gradle build (unlike for Maven) * Get rid of JFrog CLI * Generate Gradle init script manually for our `libs-staging-local` and use respective secrets for credentials See more info in: jfrog/jfrog-cli#2364
1 parent ac4aa7c commit eb68d6d

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

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

Lines changed: 24 additions & 24 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
@@ -19,31 +26,24 @@ jobs:
1926
repository: spring-projects/spring-integration
2027
show-progress: false
2128

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

38-
- name: Verify Spring Integration Kafka against staged release
32+
- name: Prepare Spring Integration project against Staging
3933
run: |
34+
printf "allprojects {
35+
repositories {
36+
maven {
37+
url 'https://repo.spring.io/libs-staging-local'
38+
credentials {
39+
username = '$ARTIFACTORY_USERNAME'
40+
password = '$ARTIFACTORY_PASSWORD'
41+
}
42+
}
43+
}
44+
}" > staging-repo-init.gradle
45+
4046
sed -i "1,/springKafkaVersion.*/s/springKafkaVersion.*/springKafkaVersion='${{ inputs.releaseVersion }}'/" build.gradle
41-
jf gradle :spring-integration-kafka:check
4247
43-
- name: Capture Test Results
44-
if: failure()
45-
uses: actions/upload-artifact@v3
46-
with:
47-
name: test-results
48-
path: '**/target/surefire-reports/**/*.*'
49-
retention-days: 1
48+
- name: Verify Spring Integration Samples against staged release
49+
run: gradle :spring-integration-kafka:check --init-script staging-repo-init.gradle

0 commit comments

Comments
 (0)