Skip to content

Commit 099356a

Browse files
author
Corneil du Plessis
authored
[CI] Update jfrog cli to v3 (#6082)
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 1fe9508 commit 099356a

10 files changed

+52
-64
lines changed

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

+10-12
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ jobs:
2525
with:
2626
maven-version: 3.8.8
2727
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
28-
- uses: jfrog/setup-jfrog-cli@v1
29-
with:
30-
version: 1.46.4
28+
- uses: jfrog/setup-jfrog-cli@v3
3129
env:
32-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
30+
JF_URL: 'https://repo.spring.io'
31+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
3332
- uses: actions/cache@v3
3433
with:
3534
path: ~/.m2/repository
@@ -44,8 +43,8 @@ jobs:
4443
- name: Configure JFrog Cli
4544
run: |
4645
jfrog rt mvnc \
47-
--server-id-resolve=repo.spring.io \
48-
--server-id-deploy=repo.spring.io \
46+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
47+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
4948
--repo-resolve-releases=libs-milestone \
5049
--repo-resolve-snapshots=libs-snapshot \
5150
--repo-deploy-releases=libs-release-local \
@@ -122,11 +121,10 @@ jobs:
122121
with:
123122
maven-version: 3.8.8
124123
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
125-
- uses: jfrog/setup-jfrog-cli@v1
126-
with:
127-
version: 1.46.4
124+
- uses: jfrog/setup-jfrog-cli@v3
128125
env:
129-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
126+
JF_URL: 'https://repo.spring.io'
127+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
130128
- name: Login dockerhub
131129
uses: docker/login-action@v3
132130
with:
@@ -135,8 +133,8 @@ jobs:
135133
- name: Configure JFrog Cli
136134
run: |
137135
jfrog rt mvnc \
138-
--server-id-resolve=repo.spring.io \
139-
--server-id-deploy=repo.spring.io \
136+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
137+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
140138
--repo-resolve-releases=libs-milestone \
141139
--repo-resolve-snapshots=libs-snapshot \
142140
--repo-deploy-releases=libs-release-local \

‎.github/workflows/cental-sync.yml

+3-4
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.46.4
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
# Extract build id from input
2928
- name: Extract Build Id

‎.github/workflows/central-release.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ jobs:
1717
- uses: actions/checkout@v4
1818

1919
# Setup jfrog cli
20-
- uses: jfrog/setup-jfrog-cli@v1
21-
with:
22-
version: 1.46.4
20+
- uses: jfrog/setup-jfrog-cli@v3
2321
env:
24-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
22+
JF_URL: 'https://repo.spring.io'
23+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
2524
# zoo extract and ensure
2625
- name: Extract Zoo Context Properties
2726
uses: jvalkeal/[email protected]

‎.github/workflows/ci.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@ jobs:
4444
maven-version: 3.8.8
4545
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
4646
# jfrog cli
47-
- uses: jfrog/setup-jfrog-cli@v1
48-
with:
49-
version: 1.46.4
47+
- uses: jfrog/setup-jfrog-cli@v3
5048
env:
51-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
49+
JF_URL: 'https://repo.spring.io'
50+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
5251
- name: Login dockerhub
5352
uses: docker/login-action@v3
5453
with:
@@ -58,8 +57,8 @@ jobs:
5857
- name: Configure JFrog Cli
5958
run: |
6059
jfrog rt mvnc \
61-
--server-id-resolve=repo.spring.io \
62-
--server-id-deploy=repo.spring.io \
60+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
61+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
6362
--repo-resolve-releases=libs-milestone \
6463
--repo-resolve-snapshots=libs-snapshot \
6564
--repo-deploy-releases=libs-release-local \
@@ -134,11 +133,10 @@ jobs:
134133
with:
135134
maven-version: 3.8.8
136135
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
137-
- uses: jfrog/setup-jfrog-cli@v1
138-
with:
139-
version: 1.46.4
136+
- uses: jfrog/setup-jfrog-cli@v3
140137
env:
141-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
138+
JF_URL: 'https://repo.spring.io'
139+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
142140
- name: Login dockerhub
143141
uses: docker/login-action@v3
144142
with:
@@ -147,8 +145,8 @@ jobs:
147145
- name: Configure JFrog Cli
148146
run: |
149147
jfrog rt mvnc \
150-
--server-id-resolve=repo.spring.io \
151-
--server-id-deploy=repo.spring.io \
148+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
149+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
152150
--repo-resolve-releases=libs-milestone \
153151
--repo-resolve-snapshots=libs-snapshot \
154152
--repo-deploy-releases=libs-release-local \

‎.github/workflows/milestone-worker.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ jobs:
2424
with:
2525
maven-version: 3.8.8
2626
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
27-
- uses: jfrog/setup-jfrog-cli@v1
28-
with:
29-
version: 1.46.4
27+
- uses: jfrog/setup-jfrog-cli@v3
3028
env:
31-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
29+
JF_URL: 'https://repo.spring.io'
30+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
3231
- uses: actions/cache@v3
3332
with:
3433
path: ~/.m2/repository
@@ -40,8 +39,8 @@ jobs:
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

+5-6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ jobs:
2424
with:
2525
maven-version: 3.8.8
2626
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
27-
- uses: jfrog/setup-jfrog-cli@v1
28-
with:
29-
version: 1.46.4
27+
- uses: jfrog/setup-jfrog-cli@v3
3028
env:
31-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
29+
JF_URL: 'https://repo.spring.io'
30+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
3231

3332
# cache maven .m2
3433
- uses: actions/cache@v3
@@ -42,8 +41,8 @@ jobs:
4241
- name: Configure JFrog Cli
4342
run: |
4443
jfrog rt mvnc \
45-
--server-id-resolve=repo.spring.io \
46-
--server-id-deploy=repo.spring.io \
44+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
45+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
4746
--repo-resolve-releases=libs-milestone \
4847
--repo-resolve-snapshots=libs-snapshot \
4948
--repo-deploy-releases=libs-release-local \

‎.github/workflows/promote-milestone.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ jobs:
1414
steps:
1515
# need repo to push release branch and a tag
1616
- uses: actions/checkout@v4
17-
- uses: jfrog/setup-jfrog-cli@v1
18-
with:
19-
version: 1.46.4
17+
- uses: jfrog/setup-jfrog-cli@v3
2018
env:
21-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
19+
JF_URL: 'https://repo.spring.io'
20+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
2221
# zoo extract and ensure
2322
- name: Extract Zoo Context Properties
2423
uses: jvalkeal/[email protected]

‎.github/workflows/promote-release.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ jobs:
1414
steps:
1515
# need repo to push release branch and a tag
1616
- uses: actions/checkout@v4
17-
- uses: jfrog/setup-jfrog-cli@v1
18-
with:
19-
version: 1.46.4
17+
- uses: jfrog/setup-jfrog-cli@v3
2018
env:
21-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
19+
JF_URL: 'https://repo.spring.io'
20+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
2221
# zoo extract and ensure
2322
- name: Extract Zoo Context Properties
2423
uses: jvalkeal/[email protected]

‎.github/workflows/publish-docs.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ jobs:
2020
with:
2121
maven-version: 3.8.8
2222
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
23-
- uses: jfrog/setup-jfrog-cli@v1
24-
with:
25-
version: 1.46.4
23+
- uses: jfrog/setup-jfrog-cli@v3
2624
env:
27-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
25+
JF_URL: 'https://repo.spring.io'
26+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
2827
- uses: actions/cache@v3
2928
with:
3029
path: ~/.m2/repository
@@ -36,8 +35,8 @@ jobs:
3635
- name: Configure JFrog Cli
3736
run: |
3837
jfrog rt mvnc \
39-
--server-id-resolve=repo.spring.io \
40-
--server-id-deploy=repo.spring.io \
38+
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
39+
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
4140
--repo-resolve-releases=libs-release-staging \
4241
--repo-resolve-snapshots=libs-snapshot \
4342
--repo-deploy-releases=libs-staging-local \

‎.github/workflows/release-worker.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ jobs:
2424
with:
2525
maven-version: 3.8.8
2626
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
27-
- uses: jfrog/setup-jfrog-cli@v1
28-
with:
29-
version: 1.46.4
27+
- uses: jfrog/setup-jfrog-cli@v3
3028
env:
31-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
29+
JF_URL: 'https://repo.spring.io'
30+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
3231
- uses: actions/cache@v3
3332
with:
3433
path: ~/.m2/repository
@@ -40,8 +39,8 @@ jobs:
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-release-staging \
4645
--repo-resolve-snapshots=libs-snapshot \
4746
--repo-deploy-releases=libs-staging-local \

0 commit comments

Comments
 (0)