[CI] update jfrog usage

spring-cloud · Oct 4, 2024 · bb4cbb7 · bb4cbb7
1 parent 0dd370c
commit bb4cbb7
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 36 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -11,6 +11,8 @@ on:
         type: boolean
         default: false
         description: 'Delete the image tags'
+env:
+  MVN: 'jfrog mvn'
 
 jobs:
   # test templating before publishing a package
@@ -24,13 +26,26 @@ jobs:
         with:
           java-version: '17'
           distribution: 'liberica'
+      - uses: jfrog/setup-jfrog-cli@v4
+        env:
+          JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+      - name: Configure JFrog Cli
+        run: |
+          jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true 
+          jfrog mvnc --use-wrapper \
+            --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-release-local \
+            --repo-deploy-snapshots=libs-snapshot-local
       - name: Load matrix
         id: matrix
         shell: bash
         run: |          
           if [ "${{ inputs.version }}" == "" ]; then
-            ./mvnw help:evaluate -Dexpression=project.version -s .settings.xml > /dev/null
-            VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+            $MVN help:evaluate -Dexpression=project.version -s .settings.xml > /dev/null
+            VERSION=$($MVN help:evaluate -Dexpression=project.version -q -DforceStdout)
             echo "::notice::VERSION=$VERSION"
             echo "VERSION=$VERSION" >> $GITHUB_ENV
           else

diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml
@@ -40,7 +40,7 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Configure JFrog Cli
       run: |
-        jfrog rt mvnc --use-wrapper \
+        jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \
           --repo-resolve-releases=libs-milestone \
@@ -56,17 +56,19 @@ jobs:
     - name: Build and Publish
       shell: bash
       timeout-minutes: 75
+      env:
+        MVN: 'jfrog mvn'
       run: |
-        ./mvnw --help
+        $MVN --help
         ./spring-cloud-dataflow-package/set-package-version.sh
-        jfrog mvn -s .settings.xml install -Pfull,docs -B
-        jfrog mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
+        $MVN -s .settings.xml install -Pfull,docs -B
+        $MVN -s .settings.xml install -pl spring-cloud-dataflow-package -B
         jfrog rt build-publish        
-        PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+        PROJECT_VERSION=$($MVN help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
-        echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout) >> $GITHUB_ENV
+        echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$($MVN help:evaluate -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout) >> $GITHUB_ENV
 #        echo "Determine project version"
 #        set +e
 #        echo "::info ::Project version=$PROJECT_VERSION"
@@ -127,7 +129,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Configure JFrog Cli
         run: |
-          jfrog rt mvnc --use-wrapper \
+          jfrog mvnc --use-wrapper \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-milestone \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
       - '.github/**'
 
 env:
-  MAVEN_THREADS: '-T 1'
+  MVN: 'jfrog mvn'
 
 jobs:
   build:
@@ -34,20 +34,18 @@ jobs:
       with:
         java-version: '17'
         distribution: 'liberica'
-#     jfrog cli
-    - uses: jfrog/setup-jfrog-cli@v4
-      env:
-        JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Login dockerhub
       uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-#       setup frog cli
+    - uses: jfrog/setup-jfrog-cli@v4
+      env:
+        JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
         jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true 
-        jfrog rt mvnc --use-wrapper \
+        jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \
           --repo-resolve-releases=libs-milestone \
@@ -56,20 +54,20 @@ jobs:
           --repo-deploy-snapshots=libs-snapshot-local
         echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-main >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
-        echo "::notice::$(./mvnw --version)"
-        ./mvnw help:evaluate -s .settings.xml -Dexpression=project.version
-        echo spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
+        echo "::notice::$($MVN --version)"
+        $MVN help:evaluate -s .settings.xml -Dexpression=project.version
+        echo spring_cloud_dataflow_version=$($MVN help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
 #       build and publish
     - name: Build and Publish
       shell: bash
       timeout-minutes: 75
-      run: |
+      run: |        
         ./spring-cloud-dataflow-package/set-package-version.sh
-        jfrog mvn -s .settings.xml install -Pfull,docs -B
-        jfrog mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
+        $MVN -s .settings.xml install -Pfull,docs -B
+        $MVN -s .settings.xml install -pl spring-cloud-dataflow-package -B
         jfrog rt build-publish
         export JFROG_CLI_BUILD_NAME="${JFROG_CLI_BUILD_NAME/spring-cloud-dataflow/spring-cloud-skipper}"
-        PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+        PROJECT_VERSION=$($MVN help:evaluate -Dexpression=project.version -q -DforceStdout)
 #        set +e
 #        echo "::info ::Project version=$PROJECT_VERSION"
 #        SKIPPER_DOCS_PATTERN=$(.github/workflows/skipper-docs-name.sh $PROJECT_VERSION libs-snapshot-local)
@@ -133,7 +131,7 @@ jobs:
     - name: Configure JFrog Cli
       run: |
         jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true
-        jfrog rt mvnc --use-wrapper \
+        jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \
           --repo-resolve-releases=libs-milestone \
@@ -144,9 +142,9 @@ jobs:
       shell: bash
       timeout-minutes: 75
       run: |                        
-        jfrog mvn clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
+        $MVN clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
         export ENABLE_${{ matrix.db }}=true
-        jfrog mvn test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
+        $MVN test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
     - name: Test Report
       uses: dorny/test-reporter@v1
       if: ${{ success() || failure() }}

diff --git a/.github/workflows/export-app-versions.sh b/.github/workflows/export-app-versions.sh
@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
 set +e
-./mvnw --version
-./mvnw help:evaluate -Dexpression=project.version > /dev/null
-DATAFLOW_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+if [ "$MVN" = "" ]; then
+    MVN=./mvnw
+fi
+$MVN --version
+$MVN help:evaluate -Dexpression=project.version > /dev/null
+DATAFLOW_VERSION=$($MVN help:evaluate -Dexpression=project.version -q -DforceStdout)
 RC=$?
 if ((RC!=0)); then
     echo "DATAFLOW_VERSION=$DATAFLOW_VERSION"
     exit $RC
 fi
 echo "DATAFLOW_VERSION=$DATAFLOW_VERSION"
-SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version  -pl spring-cloud-dataflow-parent -q -DforceStdout)
+SKIPPER_VERSION=$($MVN help:evaluate -Dexpression=spring-cloud-skipper.version  -pl spring-cloud-dataflow-parent -q -DforceStdout)
 if [[ "$SKIPPER_VERSION" = *"ERROR"* ]]; then
-    SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version -q -DforceStdout)
+    SKIPPER_VERSION=$($MVN help:evaluate -Dexpression=spring-cloud-skipper.version -q -DforceStdout)
 fi
 RC=$?
 if ((RC!=0)); then

diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml
@@ -39,7 +39,7 @@ jobs:
 #     target deploy repos
     - name: Configure JFrog Cli
       run: |
-        jfrog rt mvnc --use-wrapper \
+        jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \
           --repo-resolve-releases=libs-milestone \

diff --git a/.github/workflows/next-dev-version-worker.yml b/.github/workflows/next-dev-version-worker.yml
@@ -40,7 +40,7 @@ jobs:
     # target deploy repos
     - name: Configure JFrog Cli
       run: |
-        jfrog rt mvnc --use-wrapper \
+        jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \
           --repo-resolve-releases=libs-milestone \

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -34,7 +34,7 @@ jobs:
 #       target deploy repos
       - name: Configure JFrog Cli
         run: |
-          jfrog rt mvnc --use-wrapper \
+          jfrog mvnc --use-wrapper \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-release-staging \

diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml
@@ -39,7 +39,7 @@ jobs:
 #       target deploy repos
       - name: Configure JFrog Cli
         run: |
-          jfrog rt mvnc --use-wrapper \
+          jfrog mvnc --use-wrapper \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-release-staging \

diff --git a/spring-cloud-dataflow-package/set-package-version.sh b/spring-cloud-dataflow-package/set-package-version.sh
@@ -3,11 +3,14 @@ if [ -z "$BASH_VERSION" ]; then
     echo "This script requires Bash. Use: bash $0 $*"
     exit 0
 fi
+if [ "$MVN" = "" ]; then
+    MVN=./mvnw
+fi
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 ROOT=$(realpath $SCDIR/..)
 if [ "$PACKAGE_VERSION" = "" ]; then
     pushd $ROOT > /dev/null
-    ./mvnw help:evaluate -s .settings.xml -Dexpression=project.version > /dev/null
+    $MVN help:evaluate -s .settings.xml -Dexpression=project.version > /dev/null
     PACKAGE_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
     popd > /dev/null
 fi