From 31d4cd2b73132468db57d4df5bd8c4ff53fdaf07 Mon Sep 17 00:00:00 2001
From: Chris Bono <cbono@vmware.com>
Date: Sat, 7 Oct 2023 15:17:58 -0500
Subject: [PATCH] [CI] Rename apps-plugin workflows

* Consolidate the CI and snapshot workflow
---
 .github/workflows/apps-plugin-ci.yml        | 23 ++++-----
 .github/workflows/apps-plugin-milestone.yml |  2 +-
 .github/workflows/apps-plugin-release.yml   |  2 +-
 .github/workflows/apps-plugin-snapshot.yml  | 56 ---------------------
 4 files changed, 13 insertions(+), 70 deletions(-)
 delete mode 100644 .github/workflows/apps-plugin-snapshot.yml

diff --git a/.github/workflows/apps-plugin-ci.yml b/.github/workflows/apps-plugin-ci.yml
index 887013a8..8e8ac0ba 100644
--- a/.github/workflows/apps-plugin-ci.yml
+++ b/.github/workflows/apps-plugin-ci.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Apps Plugin (Snapshot)
 
 on:
   workflow_dispatch:
@@ -18,12 +18,6 @@ jobs:
         working-directory: spring-cloud-dataflow-apps-plugin
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-m2-
       - uses: actions/setup-java@v3
         with:
           java-version: '8'
@@ -37,6 +31,12 @@ jobs:
           version: 1.46.4
         env:
           JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-m2-
       - name: Configure JFrog Cli
         run: |
           jfrog rt mvnc \
@@ -44,15 +44,14 @@ jobs:
             --server-id-deploy=repo.spring.io \
             --repo-resolve-releases=libs-milestone \
             --repo-resolve-snapshots=libs-snapshot \
-            --repo-deploy-releases=libs-release-local \
+            --repo-deploy-releases=libs-milestone-local \
             --repo-deploy-snapshots=libs-snapshot-local
-          echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-apps-plugin-main >> $GITHUB_ENV
+          echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-apps-plugin-main-snapshot >> $GITHUB_ENV
           echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
-          echo spring_cloud_dataflow_apps_plugin_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
       - name: Build and Publish
         run: |
-          mvn clean
-          jfrog rt mvn -gs settings.xml -Pfull -B install
+          jfrog rt build-clean
+          jfrog rt mvn -gs settings.xml -Pfull,deploymentfiles -B install 
           jfrog rt build-publish
       - name: Capture Test Results
         if: ${{ always() }}
diff --git a/.github/workflows/apps-plugin-milestone.yml b/.github/workflows/apps-plugin-milestone.yml
index 9de05fc3..bfda9e5e 100644
--- a/.github/workflows/apps-plugin-milestone.yml
+++ b/.github/workflows/apps-plugin-milestone.yml
@@ -1,4 +1,4 @@
-name: Milestone Worker
+name: Apps Plugin (Milestone)
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/apps-plugin-release.yml b/.github/workflows/apps-plugin-release.yml
index 03310916..4d64e573 100644
--- a/.github/workflows/apps-plugin-release.yml
+++ b/.github/workflows/apps-plugin-release.yml
@@ -1,4 +1,4 @@
-name: Release Worker
+name: Apps Plugin (Release)
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/apps-plugin-snapshot.yml b/.github/workflows/apps-plugin-snapshot.yml
deleted file mode 100644
index 943e34bb..00000000
--- a/.github/workflows/apps-plugin-snapshot.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Snapshot Worker
-
-on:
-  workflow_dispatch:
-
-env:
-  MAVEN_THREADS: '-T 0.5C'
-
-jobs:
-  build:
-    if: ${{ github.repository == 'spring-cloud/stream-applications' }}
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: spring-cloud-dataflow-apps-plugin
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'liberica'
-      - uses: jvalkeal/setup-maven@v1
-        with:
-          maven-version: 3.8.8
-          maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
-      - uses: jfrog/setup-jfrog-cli@v1
-        with:
-          version: 1.46.4
-        env:
-          JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-m2-
-      - name: Configure JFrog Cli
-        run: |
-          jfrog rt 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
-          echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-apps-plugin-main-snapshot >> $GITHUB_ENV
-          echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
-      - name: Build and Publish
-        run: |
-          jfrog rt build-clean
-          jfrog rt mvn -gs settings.xml -Pfull,deploymentfiles -B install 
-          jfrog rt build-publish
-          echo spring_cloud_dataflow_apps_plugin_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
-      - name: Clean cache
-        run: |
-          find ~/.m2/repository -type d -name '*SNAPSHOT' | xargs rm -fr