Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 3eb2b80

Browse files
author
Corneil du Plessis
authored
[CI] Update jfrog cli to v3 (#6083)
Update setup-jfrog-cli to use `JF_ENV_SPRING` instead of `JF_ARTIFACTORY_SPRING` Added `JF_URL` Added reference to `${{ vars.JF_SERVER_ID }}` in place of `repo.spring.io`
1 parent a576e5c commit 3eb2b80

10 files changed

+42
-52
lines changed

‎.github/workflows/build-snapshot-worker.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,15 @@ jobs:
4040
with:
4141
maven-version: 3.8.8
4242
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
43-
- uses: jfrog/setup-jfrog-cli@v1
44-
with:
45-
version: 1.54.0
43+
- uses: jfrog/setup-jfrog-cli@v3
4644
env:
47-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
45+
JF_URL: 'https://repo.spring.io'
46+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
4847
- name: Configure JFrog Cli
4948
run: |
5049
jfrog rt mvnc \
51-
--server-id-resolve=repo.spring.io \
52-
--server-id-deploy=repo.spring.io \
50+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
51+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
5352
--repo-resolve-releases=libs-milestone \
5453
--repo-resolve-snapshots=libs-snapshot \
5554
--repo-deploy-releases=libs-release-local \

‎.github/workflows/cental-sync.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
# Setup jfrog cli
22-
- uses: jfrog/setup-jfrog-cli@v1
23-
with:
24-
version: 1.54.0
22+
- uses: jfrog/setup-jfrog-cli@v3
2523
env:
26-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
24+
JF_URL: 'https://repo.spring.io'
25+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
2726

2827

2928
# Extract build id from input

‎.github/workflows/central-release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ jobs:
1616
# to get spec file in .github
1717
- uses: actions/checkout@v4
1818

19-
- uses: jfrog/setup-jfrog-cli@v1
20-
with:
21-
version: 1.54.0
19+
- uses: jfrog/setup-jfrog-cli@v3
2220
env:
23-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
21+
JF_URL: 'https://repo.spring.io'
22+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
2423

2524
# zoo extract and ensure
2625
- name: Extract Zoo Context Properties

‎.github/workflows/ci.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,15 @@ jobs:
5151
with:
5252
maven-version: 3.8.8
5353
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
54-
- uses: jfrog/setup-jfrog-cli@v1
55-
with:
56-
version: 1.54.0
54+
- uses: jfrog/setup-jfrog-cli@v3
5755
env:
58-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
56+
JF_URL: 'https://repo.spring.io'
57+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
5958
- name: Configure JFrog Cli
6059
run: |
6160
jfrog rt mvnc \
62-
--server-id-resolve=repo.spring.io \
63-
--server-id-deploy=repo.spring.io \
61+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
62+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
6463
--repo-resolve-releases=libs-milestone \
6564
--repo-resolve-snapshots=libs-snapshot \
6665
--repo-deploy-releases=libs-release-local \

‎.github/workflows/milestone-worker.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ jobs:
3232
with:
3333
maven-version: 3.8.8
3434
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
35-
- uses: jfrog/setup-jfrog-cli@v1
36-
with:
37-
version: 1.54.0
35+
- uses: jfrog/setup-jfrog-cli@v3
3836
env:
39-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
37+
JF_URL: 'https://repo.spring.io'
38+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
4039
- name: Configure JFrog Cli
4140
run: |
4241
jfrog rt mvnc \
43-
--server-id-resolve=repo.spring.io \
44-
--server-id-deploy=repo.spring.io \
42+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
43+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
4544
--repo-resolve-releases=libs-milestone \
4645
--repo-resolve-snapshots=libs-snapshot \
4746
--repo-deploy-releases=libs-milestone-local \

‎.github/workflows/next-dev-version-worker.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,15 @@ jobs:
3737
with:
3838
maven-version: 3.8.8
3939
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
40-
- uses: jfrog/setup-jfrog-cli@v1
41-
with:
42-
version: 1.54.0
40+
- uses: jfrog/setup-jfrog-cli@v3
4341
env:
44-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
42+
JF_URL: 'https://repo.spring.io'
43+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
4544
- name: Configure JFrog Cli
4645
run: |
4746
jfrog rt mvnc \
48-
--server-id-resolve=repo.spring.io \
49-
--server-id-deploy=repo.spring.io \
47+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
48+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
5049
--repo-resolve-releases=libs-milestone \
5150
--repo-resolve-snapshots=libs-snapshot \
5251
--repo-deploy-releases=libs-release-local \

‎.github/workflows/promote-milestone.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ jobs:
2626
BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_buildnumber
2727
BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname
2828
BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber
29-
- uses: jfrog/setup-jfrog-cli@v1
30-
with:
31-
version: 1.54.0
29+
- uses: jfrog/setup-jfrog-cli@v3
3230
env:
33-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
31+
JF_URL: 'https://repo.spring.io'
32+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
3433
- name: Promote Build
3534
run: |
3635
jfrog rt build-promote $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildname $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildnumber libs-milestone-local

‎.github/workflows/promote-release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ jobs:
2626
BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_buildnumber
2727
BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname
2828
BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber
29-
- uses: jfrog/setup-jfrog-cli@v1
30-
with:
31-
version: 1.54.0
29+
- uses: jfrog/setup-jfrog-cli@v3
3230
env:
33-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
31+
JF_URL: 'https://repo.spring.io'
32+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
3433
- name: Promote Build
3534
run: |
3635
jfrog rt build-promote $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildname $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildnumber libs-release-local

‎.github/workflows/publish-docs.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@ jobs:
3030
with:
3131
maven-version: 3.8.8
3232
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
33-
- uses: jfrog/setup-jfrog-cli@v1
34-
with:
35-
version: 1.54.0
33+
- uses: jfrog/setup-jfrog-cli@v3
3634
env:
37-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
35+
JF_URL: 'https://repo.spring.io'
36+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
3837
- name: Configure JFrog Cli
3938
run: |
4039
jfrog rt mvnc \
41-
--server-id-resolve=repo.spring.io \
42-
--server-id-deploy=repo.spring.io \
40+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
41+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
4342
--repo-resolve-releases=libs-release-staging \
4443
--repo-resolve-snapshots=libs-snapshot \
4544
--repo-deploy-releases=libs-staging-local \

‎.github/workflows/release-worker.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@ jobs:
3333
with:
3434
maven-version: 3.8.8
3535
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
36-
- uses: jfrog/setup-jfrog-cli@v1
37-
with:
38-
version: 1.54.0
36+
- uses: jfrog/setup-jfrog-cli@v3
3937
env:
40-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
38+
JF_URL: 'https://repo.spring.io'
39+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
4140
- name: Configure JFrog Cli
4241
run: |
4342
jfrog rt mvnc \
44-
--server-id-resolve=repo.spring.io \
45-
--server-id-deploy=repo.spring.io \
43+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
44+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
4645
--repo-resolve-releases=libs-release-staging \
4746
--repo-resolve-snapshots=libs-snapshot \
4847
--repo-deploy-releases=libs-staging-local \

0 commit comments

Comments
 (0)