From 497a41d0c9e735c2b2c3148080777fc36bd73f5f Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Tue, 10 Dec 2024 13:53:17 +0200 Subject: [PATCH] Update JFrog CLI Usage --- .github/workflows/ci.yml | 7 +++---- .github/workflows/release-ga.yml | 13 +++++-------- .github/workflows/release-milestone.yml | 6 ++---- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2beb3b82..4ae0dce4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,13 +48,12 @@ jobs: 17 cache: gradle - uses: jfrog/setup-jfrog-cli@v3 - with: - version: 2.21.5 env: + JF_URL: 'https://repo.spring.io' JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | - jf rt gradlec \ + jf gradlec \ --use-wrapper \ --uses-plugin \ --deploy-ivy-desc=false \ @@ -72,5 +71,5 @@ jobs: GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: | - jf rt gradle build artifactoryPublish + jf gradle build artifactoryPublish jf rt build-publish diff --git a/.github/workflows/release-ga.yml b/.github/workflows/release-ga.yml index f56d3a73..1a50fc1c 100644 --- a/.github/workflows/release-ga.yml +++ b/.github/workflows/release-ga.yml @@ -21,13 +21,12 @@ jobs: with: maven-version: 3.8.4 - uses: jfrog/setup-jfrog-cli@v3 - with: - version: 2.21.5 env: + JF_URL: 'https://repo.spring.io' JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | - jf rt gradlec \ + jf gradlec \ --use-wrapper \ --uses-plugin \ --deploy-ivy-desc=false \ @@ -61,7 +60,7 @@ jobs: GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: | - jf rt gradle build artifactoryPublish + jf gradle build artifactoryPublish jf rt build-publish - name: Push Release env: @@ -83,9 +82,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: jfrog/setup-jfrog-cli@v3 - with: - version: 2.21.5 env: + JF_URL: 'https://repo.spring.io' JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | @@ -159,9 +157,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: jfrog/setup-jfrog-cli@v3 - with: - version: 2.21.5 env: + JF_URL: 'https://repo.spring.io' JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml index 9ae7313c..3bfed06a 100644 --- a/.github/workflows/release-milestone.yml +++ b/.github/workflows/release-milestone.yml @@ -24,9 +24,8 @@ jobs: with: maven-version: 3.8.4 - uses: jfrog/setup-jfrog-cli@v3 - with: - version: 2.21.5 env: + JF_URL: 'https://repo.spring.io' JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | @@ -87,9 +86,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: jfrog/setup-jfrog-cli@v3 - with: - version: 2.21.5 env: + JF_URL: 'https://repo.spring.io' JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: |