Fix some naming for GHA workflows

spring-projects · Nov 14, 2023 · c31c91c · c31c91c
1 parent 44f12f6
commit c31c91c
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 21 deletions.
diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml
@@ -7,6 +7,6 @@ on:
       - main
 
 jobs:
-  build_snapshot:
+  build-snapshot:
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-gradle-snapshot.yml@main
     secrets: inherit
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -6,5 +6,5 @@ on:
       - main
 
 jobs:
-  build:
+  build-pull-request:
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-gradle-pull-request-build.yml@main
diff --git a/.github/workflows/spring-artifactory-gradle-release-staging.yml b/.github/workflows/spring-artifactory-gradle-release-staging.yml
@@ -19,7 +19,7 @@ env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
 
 jobs:
-  staging:
+  staging-to-artifactory-with-gradle:
     runs-on: ubuntu-latest
     steps:
 

diff --git a/.github/workflows/spring-artifactory-gradle-snapshot.yml b/.github/workflows/spring-artifactory-gradle-snapshot.yml
@@ -15,7 +15,7 @@ env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
 
 jobs:
-  build_snapshot:
+  build-snapshot-with-gradle:
     runs-on: ubuntu-latest
     name: CI Build SNAPSHOT for ${{ github.ref_name }}
     steps:

diff --git a/.github/workflows/spring-artifactory-promote-central.yml b/.github/workflows/spring-artifactory-promote-central.yml
@@ -13,7 +13,7 @@ on:
         type: string
 
 jobs:
-  release_to_central:
+  release-to-central:
     runs-on: ubuntu-latest
     steps:
 
@@ -29,8 +29,7 @@ jobs:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
 
       - name: Promote Build
-        run: |
-          jfrog rt build-promote ${{ inputs.buildName }} ${{ inputs.buildNumber }} libs-release-local
+        run: jfrog rt build-promote ${{ inputs.buildName }} ${{ inputs.buildNumber }} libs-release-local
 
       # Download released files
       - name: Download Release Files

diff --git a/.github/workflows/spring-artifactory-promote-milestone.yml b/.github/workflows/spring-artifactory-promote-milestone.yml
@@ -13,7 +13,7 @@ on:
         type: string
 
 jobs:
-  promote_milestone:
+  promote-milestone-with-jfrog:
     runs-on: ubuntu-latest
     steps:
 
@@ -24,5 +24,4 @@ jobs:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
 
       - name: Promote Build
-        run: |
-          jfrog rt build-promote ${{ inputs.buildName }} ${{ inputs.buildNumber }} libs-milestone-local
+        run: jfrog rt build-promote ${{ inputs.buildName }} ${{ inputs.buildNumber }} libs-milestone-local
diff --git a/.github/workflows/spring-artifactory-release.yml b/.github/workflows/spring-artifactory-release.yml
@@ -28,7 +28,7 @@ jobs:
       releaseVersion: ${{ inputs.releaseVersion }}
     secrets: inherit
 
-  promote_milestone:
+  promote-milestone:
     if: ${{ contains(inputs.releaseVersion, '-M') || contains(inputs.releaseVersion, '-RC') }}
     needs: verify-staged
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-promote-milestone.yml@main
@@ -37,7 +37,7 @@ jobs:
       buildNumber: $JFROG_CLI_BUILD_NUMBER
     secrets: inherit
 
-  promote_ga:
+  promote-ga:
     if: ${{ ! contains(inputs.releaseVersion, '-') }}
     needs: verify-staged
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-promote-central.yml@main

diff --git a/.github/workflows/stage-release.yml b/.github/workflows/stage-release.yml
@@ -9,7 +9,7 @@ on:
         type: string
 
 jobs:
-  staging:
+  staging-with-gradle:
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-gradle-release-staging.yml@main
     with:
       releaseVersion: ${{ inputs.releaseVersion }}

diff --git a/.github/workflows/verify-staged-artifacts.yml b/.github/workflows/verify-staged-artifacts.yml
@@ -9,16 +9,15 @@ on:
         type: string
 
 jobs:
-  verify-staged:
+  verify-staged-with-jfrog:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - uses: jfrog/setup-jfrog-cli@v3
         with:
-          distribution: adopt
-          java-version: 17
-          cache: 'maven'
+          version: 2.50.4
+        env:
+          JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
 
-      - name: Download staged artifact
-        run: mvn dependency:get -DrepoUrl=https://repo.spring.io/libs-staging-local -Dartifact=org.springframework.integration:spring-integration-aws:${{ inputs.releaseVersion }}
+      - name: Download Artifact from Staging Repo
+        run: jfrog rt download libs-staging-local/org/springframework/integration/spring-integration-aws/${{ inputs.releaseVersion }}/spring-integration-aws-${{ inputs.releaseVersion }}.jar
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,5 @@ on: @@
           - main
     jobs:
-      build:
+      build-pull-request:
         uses: spring-projects/spring-integration-aws/.github/workflows/spring-gradle-pull-request-build.yml@main