workflow update

HHS · Feb 4, 2024 · f3435f9 · f3435f9
1 parent b3dcf18
commit f3435f9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Build Util
       run: mvn clean install -DskipTests --file util/pom.xml
     - name: Build Taskit
-      run: mvn clean install --file pom.xml
+      run: mvn clean package --file pom.xml
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
    # - name: Update dependency graph

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -22,11 +22,6 @@ jobs:
     steps:
     - name: Checkout Taskit
       uses: actions/checkout@v4
-    - name: Checkout Util
-      uses: actions/checkout@v4
-      with:
-        repository: HHS/ASPR-ms-util
-        path: util
 
     - name: Set up JDK 17
       uses: actions/setup-java@v4
@@ -35,6 +30,17 @@ jobs:
         distribution: 'temurin'
         cache: maven
 
+    - name: Get Util Version
+      run: |
+        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file 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 Taskit

diff --git a/.github/workflows/release_pr_build.yml b/.github/workflows/release_pr_build.yml
@@ -20,11 +20,6 @@ jobs:
     steps:
     - name: Checkout Taskit
       uses: actions/checkout@v4
-    - name: Checkout Util
-      uses: actions/checkout@v4
-      with:
-        repository: HHS/ASPR-ms-util
-        path: util
 
     - name: Set up JDK 17
       uses: actions/setup-java@v4
@@ -33,6 +28,17 @@ jobs:
         distribution: 'temurin'
         cache: maven
 
+    - name: Get Util Version
+      run: |
+        echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file 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 Taskit