Update jfrog to use JF_SERVER_ID

This commit is contained in:
Corneil du Plessis
2024-12-11 13:00:40 +02:00
parent c1c8d9eca2
commit a4446f7547
3 changed files with 9 additions and 6 deletions

View File

@@ -37,8 +37,8 @@ jobs:
- name: Configure JFrog Cli
run: |
jfrog rt mvnc \
--server-id-resolve=repo.spring.io \
--server-id-deploy=repo.spring.io \
--server-id-resolve=${{ vars.JF_SERVER_ID }} \
--server-id-deploy=${{ vars.JF_SERVER_ID }} \
--repo-resolve-releases=libs-milestone \
--repo-resolve-snapshots=libs-snapshot \
--repo-deploy-releases=libs-milestone-local \

View File

@@ -689,6 +689,8 @@ jobs:
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
- name: Configure JFrog Cli
shell: bash
env:
JF_SERVER_ID: ${{ vars.JF_SERVER_ID }}
run: |
./configure-jfrog.sh ${{ needs.parameters.outputs.build_version_type }}
echo JFROG_CLI_BUILD_NAME=stream-apps-main-release >> $GITHUB_ENV

View File

@@ -1,14 +1,15 @@
#!/bin/bash
MVNC=
readonly JF_SERVER_ID=${JF_SERVER_ID:-spring-cloud}
case $1 in
"ga")
MVNC="--server-id-resolve=repo.spring.io --server-id-deploy=repo.spring.io --repo-resolve-releases=libs-release --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-staging-local --repo-deploy-snapshots=libs-snapshot-local"
"ga" | "release")
MVNC="--server-id-resolve=${JF_SERVER_ID} --server-id-deploy=${JF_SERVER_ID} --repo-resolve-releases=libs-release --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-staging-local --repo-deploy-snapshots=libs-snapshot-local"
;;
"milestone")
MVNC="--server-id-resolve=repo.spring.io --server-id-deploy=repo.spring.io --repo-resolve-releases=libs-milestone --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
MVNC="--server-id-resolve=${JF_SERVER_ID} --server-id-deploy=${JF_SERVER_ID} --repo-resolve-releases=libs-milestone --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
;;
"snapshot")
MVNC="--server-id-resolve=repo.spring.io --server-id-deploy=repo.spring.io --repo-resolve-releases=libs-snapshot --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
MVNC="--server-id-resolve=${JF_SERVER_ID} --server-id-deploy=${JF_SERVER_ID} --repo-resolve-releases=libs-snapshot --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
;;
*)
echo "Invalid build type $1"