workflow update

HHS · Feb 4, 2024 · ef58e8b · ef58e8b
1 parent abaa180
commit ef58e8b
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 36 deletions.
diff --git a/.github/workflows/dev-pre-mavencentral.yml → .github/workflows/dev_build.yml b/.github/workflows/dev-pre-mavencentral.yml → .github/workflows/dev_build.yml
@@ -11,28 +11,28 @@ name: Development Build Pre Maven Central
 on:
   push:
     branches: [ "dev" ]
-    paths:
-    - '**.xml'
-    - '**.java'
   pull_request:
-    branches: [ "dev" ]
+    branches-ignore: ["main"]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout GCM Taskit
       uses: actions/checkout@v4
+
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
-    - name: Get Versions
+
+    - name: Get Taskit and GCM Versions
       run: |
-        echo "taskit_version=$(mvn help:evaluate -Dexpression=taskit-protobuf.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
-        echo "gcm_version=$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit-protobuf.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+
     - name: Checkout Taskit
       uses: actions/checkout@v4
       with:
@@ -45,15 +45,18 @@ jobs:
         repository: HHS/ASPR-8
         path: gcm
         ref: ${{ (endsWith(env.gcm_version, 'SNAPSHOT') && 'dev') || env.gcm_version }}
+
     - name: Get Util Version
       run: |
         echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/gcm/pom.xml)" >> "$GITHUB_ENV"
+
     - name: Checkout Util
       uses: actions/checkout@v4
       with:
         repository: HHS/ASPR-ms-util
         path: util
         ref: ${{ (endsWith(env.util_version, 'SNAPSHOT') && 'dev') || env.util_version }}
+
     - name: Build Util
       run: mvn clean install -DskipTests --file util/pom.xml
     - name: Build GCM

diff --git a/.github/workflows/create_release_on_tag.yml → .github/workflows/release_build.yml b/.github/workflows/create_release_on_tag.yml → .github/workflows/release_build.yml
@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Create GCM Taskit Release
+name: GCM Taskit Release Build
 
 on: 
   push:
@@ -21,28 +21,43 @@ jobs:
       contents: write
     steps:
     - name: Checkout GCM Taskit
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Get Taskit and GCM Versions
+      run: |
+        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit-protobuf.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+
     - name: Checkout Taskit
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: HHS/ASPR-ms-taskit
         path: taskit
-    - name: Checkout Util
-      uses: actions/checkout@v3
-      with:
-        repository: HHS/ASPR-ms-util
-        path: util
+        ref: ${{ (endsWith(env.taskit_version, 'SNAPSHOT') && 'dev') || env.taskit_version }}
     - name: Checkout GCM
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: HHS/ASPR-8
         path: gcm
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
+        ref: ${{ (endsWith(env.gcm_version, 'SNAPSHOT') && 'dev') || env.gcm_version }}
+
+    - name: Get Util Version
+      run: |
+        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/gcm/pom.xml)" >> "$GITHUB_ENV"
+
+    - name: Checkout Util
+      uses: actions/checkout@v4
       with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
+        repository: HHS/ASPR-ms-util
+        path: util
+        ref: ${{ (endsWith(env.util_version, 'SNAPSHOT') && 'dev') || env.util_version }}
+
     - name: Build Util
       run: mvn clean install -DskipTests --file util/pom.xml
     - name: Build GCM
@@ -51,6 +66,7 @@ jobs:
       run: mvn clean install -DskipTests --file taskit/pom.xml
     - name: Build GCM Taskit
       run: mvn clean install -Prelease --file protobuf/pom.xml
+
     - name: Get Version
       run: |
         echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"

diff --git a/.github/workflows/pr_for_main.yml → .github/workflows/release_pr_build.yml b/.github/workflows/pr_for_main.yml → .github/workflows/release_pr_build.yml
@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Pull Request for Main Build
+name: GCM Taskit Release Pull Request Build
 
 on: 
   pull_request:
@@ -19,28 +19,43 @@ jobs:
       contents: write
     steps:
     - name: Checkout GCM Taskit
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Get Taskit and GCM Versions
+      run: |
+        echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit-protobuf.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+        echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file protobuf/pom.xml)" >> "$GITHUB_ENV"
+
     - name: Checkout Taskit
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: HHS/ASPR-ms-taskit
         path: taskit
-    - name: Checkout Util
-      uses: actions/checkout@v3
-      with:
-        repository: HHS/ASPR-ms-util
-        path: util
+        ref: ${{ (endsWith(env.taskit_version, 'SNAPSHOT') && 'dev') || env.taskit_version }}
     - name: Checkout GCM
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: HHS/ASPR-8
         path: gcm
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
+        ref: ${{ (endsWith(env.gcm_version, 'SNAPSHOT') && 'dev') || env.gcm_version }}
+
+    - name: Get Util Version
+      run: |
+        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/gcm/pom.xml)" >> "$GITHUB_ENV"
+
+    - name: Checkout Util
+      uses: actions/checkout@v4
       with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
+        repository: HHS/ASPR-ms-util
+        path: util
+        ref: ${{ (endsWith(env.util_version, 'SNAPSHOT') && 'dev') || env.util_version }}
+
     - name: Build Util
       run: mvn clean install -DskipTests --file util/pom.xml
     - name: Build GCM