Ensure workflows for 2022.0.x is same as main (#581)

Update 2022.0.x workflows to match main.
spring-cloud · Nov 20, 2024 · bcc0cd4 · bcc0cd4
1 parent 5a55082
commit bcc0cd4
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 20 deletions.
diff --git a/.github/actions/install-trivy/action.yml b/.github/actions/install-trivy/action.yml
@@ -0,0 +1,10 @@
+name: 'Install Trivy'
+description: 'Install Trivy'
+
+runs:
+  using: composite
+  steps:
+    - name: 'Install Trivy'
+      shell: bash
+      run: |
+        curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.50.1
diff --git a/.github/workflows/apps-plugin-milestone.yml b/.github/workflows/apps-plugin-milestone.yml
@@ -40,7 +40,7 @@ jobs:
             ${{ runner.os }}-m2-
       - name: Configure JFrog Cli
         run: |
-          jfrog mvnc \
+          jfrog rt mvnc \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-milestone \

diff --git a/.github/workflows/apps-plugin-next-dev-version.yml b/.github/workflows/apps-plugin-next-dev-version.yml
@@ -36,7 +36,7 @@ jobs:
             ${{ runner.os }}-m2-
       - name: Configure JFrog Cli
         run: |
-          jfrog mvnc \
+          jfrog rt mvnc \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-milestone \

diff --git a/.github/workflows/apps-plugin-release.yml b/.github/workflows/apps-plugin-release.yml
@@ -36,7 +36,7 @@ jobs:
             ${{ runner.os }}-m2-
       - name: Configure JFrog Cli
         run: |
-          jfrog mvnc \
+          jfrog rt mvnc \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-release-staging \

diff --git a/.github/workflows/apps-plugin-snapshot.yml b/.github/workflows/apps-plugin-snapshot.yml
@@ -2,6 +2,11 @@ name: Apps Plugin (Snapshot)
 
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'spring-cloud-dataflow-apps-plugin/**'
 
 env:
   MAVEN_THREADS: '-T 0.5C'
@@ -39,7 +44,7 @@ jobs:
             ${{ runner.os }}-m2-
       - name: Configure JFrog Cli
         run: |
-          jfrog mvnc \
+          jfrog rt mvnc \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-milestone \
@@ -51,7 +56,7 @@ jobs:
       - name: Build and Publish
         run: |
           jfrog rt build-clean
-          jfrog rt mvn -gs settings.xml -Pfull,deploymentfiles -B install 
+          jfrog rt mvn -gs settings.xml -B install 
           jfrog rt build-publish
       - name: Capture Test Results
         if: ${{ always() }}

diff --git a/.github/workflows/cental-sync-create.yml b/.github/workflows/cental-sync-create.yml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu22-8-32
+    runs-on: ubuntu22-8-32-OSS
     steps:
     - uses: actions/checkout@v3
     - uses: jfrog/setup-jfrog-cli@v3

diff --git a/.github/workflows/ci-2022-0-x.yml b/.github/workflows/ci-2022-0-x.yml
@@ -4,14 +4,15 @@ on:
   workflow_dispatch:
     inputs:
       verbose:
-        required: false
         default: 'false'
-        description: 'Produces verbose output'
+        description: 'Verbose output'
+        required: false
   push:
     paths-ignore:
       - '.github/**'
     branches:
       - '2022.0.x'
+
 jobs:
   build:
     uses: ./.github/workflows/common.yml
@@ -22,6 +23,8 @@ jobs:
       GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }}
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
       ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+      JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     with:
       branch: '2022.0.x'
       verbose: ${{ inputs.verbose == 'true' }}
+      mavenThreads: '0.5C'
diff --git a/.github/workflows/ci-it.yml b/.github/workflows/ci-it.yml
@@ -29,7 +29,7 @@ jobs:
       - name: 'Determine Java Version'
         id: determineJavaVersion
         run: |
-          if [[ "${{ inputs.version && inputs.version || '4.0.0-SNAPSHOT' }}" == *"4.0.0"* ]]; then
+          if [[ "${{ inputs.version && inputs.version || '3.2.2-SNAPSHOT' }}" != "3."* ]]; then
             JAVA_VERSION=17
           else
             JAVA_VERSION=8

diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -10,6 +10,7 @@ on:
   push:
     paths-ignore:
       - '.github/**'
+      - 'spring-cloud-dataflow-apps-plugin/**'
     branches:
       - 'main'
 

diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
@@ -203,7 +203,7 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v3
         env:
           JF_URL: 'https://repo.spring.io'
-          JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+          JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Configure JFrog Cli
         shell: bash
         run: |
@@ -358,7 +358,7 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v3
         env:
           JF_URL: 'https://repo.spring.io'
-          JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+          JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Configure JFrog Cli
         shell: bash
         run: |
@@ -479,7 +479,7 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v3
         env:
           JF_URL: 'https://repo.spring.io'
-          JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+          JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Configure JFrog Cli
         shell: bash
         run: |
@@ -609,7 +609,7 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v3
         env:
           JF_URL: 'https://repo.spring.io'
-          JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+          JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Configure JFrog Cli
         shell: bash
         run: |
@@ -767,17 +767,13 @@ jobs:
         shell: bash
         env:
           RELEASE_TRAIN_VERSION: ${{ needs.parameters.outputs.release_train_version }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          BUILD_NAME: ${{ needs.parameters.outputs.build_name }}
-          BUILD_NUMBER: ${{ needs.parameters.outputs.build_number }}
         run: |
           ROOT_DIR=$(realpath $PWD)
           pushd stream-applications > /dev/null
             echo "::notice ::uploading unique version snapshot descriptors:$RELEASE_TRAIN_VERSION"
             set -e
-            SRC_ROOT="$ROOT_DIR/stream-applications/stream-applications-release-train/stream-applications-descriptor/target/classes/META-INF"
-            TARGET_REPO="libs-snapshot-local/org/springframework/cloud/stream/app/stream-applications-descriptor/${RELEASE_TRAIN_VERSION}"
+            SRC_ROOT=$ROOT_DIR/stream-applications/stream-applications-release-train/stream-applications-descriptor/target/classes/META-INF
+            TARGET_REPO=libs-snapshot-local/org/springframework/cloud/stream/app/stream-applications-descriptor/${RELEASE_TRAIN_VERSION}
             jfrog rt upload "$SRC_ROOT/kafka-apps-maven.properties" "${TARGET_REPO}/stream-applications-descriptor-${RELEASE_TRAIN_VERSION}.stream-apps-kafka-maven"
             jfrog rt upload "$SRC_ROOT/kafka-apps-docker.properties" "${TARGET_REPO}/stream-applications-descriptor-${RELEASE_TRAIN_VERSION}.stream-apps-kafka-docker"
             jfrog rt upload "$SRC_ROOT/kafka-apps-harbor.properties" "${TARGET_REPO}/stream-applications-descriptor-${RELEASE_TRAIN_VERSION}.stream-apps-kafka-harbor"

diff --git a/.github/workflows/descriptor.yml b/.github/workflows/descriptor.yml
@@ -167,7 +167,7 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v3
         env:
           JF_URL: 'https://repo.spring.io'
-          JF_ENV_1: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+          JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: 'Build: stream-applications-release-train'
         shell: bash
         timeout-minutes: 30