review updates

mwangggg · Oct 5, 2023 · 281fd97 · 281fd97
1 parent e1000d3
commit 281fd97
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,5 +1,9 @@
 name: CI build
 
+concurrency:
+  group: ci-${{ github.run_id }}
+  cancel-in-progress: true
+
 on:
   push:
     branches:
@@ -14,6 +18,9 @@ on:
       - v[0-9]+.[0-9]+
       - cryostat-v[0-9]+.[0-9]+
 
+env:
+  TEST_VERSION: 2.24.0-SNAPSHOT
+
 jobs:
   build-core:
     runs-on: ubuntu-latest
@@ -30,7 +37,7 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         name: cryostat-core
-        path: /home/runner/work/cryostat-core/cryostat-core/target/cryostat-core-2.24.0-SNAPSHOT.jar
+        path: /home/runner/work/cryostat-core/cryostat-core/target/cryostat-core-${{ TEST_VERSION }}.jar
     - uses: skjolber/maven-cache-github-action@v1
       with:
         step: save
@@ -84,6 +91,7 @@ jobs:
 
   cryostat-test:
     runs-on: ubuntu-latest
+    needs: [push-to-ghcr]
     steps:
     - name: Install xpath
       run: |
@@ -97,7 +105,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@v3
       with:
-        java-version: '17' 02W
+        java-version: '17'
         distribution: 'temurin'
     - name: Pull cryostat image
       run: podman pull ghcr.io/${{ github.repository_owner }}/cryostat-core:pr-${{ github.event.number }}-${{ github.event.pull_request.head.sha }}-linux-${{ matrix.arch }}

diff --git a/.github/workflows/cryostat-build.yml b/.github/workflows/cryostat-build.yml
@@ -13,6 +13,10 @@ on:
         description: the Cryostat application version that will be built
         value: ${{ jobs.get-pom-properties.outputs.image-version }}
 
+env:
+  CURRENT_VERSION: "2.23.0"
+  TEST_VERSION: 2.24.0-SNAPSHOT
+
 jobs:
   get-pom-properties:
     runs-on: ubuntu-latest
@@ -23,7 +27,7 @@ jobs:
         ref: main
     - uses: Mudlet/xmlstarlet-action@master
       with:
-        args: ed -P -L -u '//_:properties[_:io.cryostat.core.version="2.23.0"]/_:io.cryostat.core.version' -v "2.24.0-SNAPSHOT" pom.xml 
+        args: ed -P -L -u '//_:properties[_:io.cryostat.core.version=${{ CURRENT_VERSION }}]/_:io.cryostat.core.version' -v ${{ TEST_VERSION }} pom.xml 
     - id: query-pom
       name: Get properties from POM
       # Query POM for image version and save as output parameter