updates

mwangggg · Oct 6, 2023 · 1b4a748 · 1b4a748
1 parent 70e8975
commit 1b4a748
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,13 +5,13 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  push:
-    branches:
-      - main
-      - v[0-9]+
-      - v[0-9]+.[0-9]+
-      - cryostat-v[0-9]+.[0-9]+
-  pull_request:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - labeled
+      - unlabeled
     branches:
       - main
       - v[0-9]+
@@ -35,10 +35,6 @@ jobs:
         distribution: 'temurin'
         cache: 'maven'
     - run: mvn -B -U clean install
-    - uses: actions/upload-artifact@v3
-      with:
-        name: cryostat-core
-        path: ${{ github.workspace }}/target/${{ steps.get_core_version.outputs.name }}-${{ steps.get_core_version.outputs.test_version }}.jar
 
   build-cryostat:
     needs: [build-core]
@@ -91,10 +87,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [push-to-ghcr]
     steps:
-    - name: Install xpath
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libxml-xpath-perl
     - uses: actions/checkout@v4
       with:
         repository: ${{ github.repository_owner }}
@@ -105,11 +97,9 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
+        cache: maven
     - 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 }}
-    - uses: skjolber/maven-cache-github-action@v1
-      with:
-        step: restore
     - name: Run integration tests
       run: POD_NAME=cryostat-itests CONTAINER_NAME=cryostat-itest ITEST_IMG_VERSION=latest bash repeated-integration-tests.bash
     - name: Print itest logs
@@ -118,9 +108,6 @@ jobs:
     - name: Print itest container logs
       if: failure()
       run: ls -1dt target/cryostat-*.server.log | head -n1 | xargs cat
-    - uses: skjolber/maven-cache-github-action@v1
-      with:
-        step: save
 
   comment-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/cryostat-build.yml b/.github/workflows/cryostat-build.yml
@@ -4,7 +4,7 @@ on:
       build-arch:
         required: true
         type: string
-      test-version:
+      core-version:
         required: true
         type: string
 
@@ -34,15 +34,9 @@ jobs:
       with:
         servers: '[{"id": "github", "username": "dummy", "password": "${env.GITHUB_TOKEN_REF}"}]'
         githubServer: false
-    - uses: skjolber/maven-cache-github-action@v1
-      with:
-        step: restore
     - run: git submodule init
     - run: git submodule update
-    - uses: actions/download-artifact@v3
-      with:
-        name: cryostat-core
-    - run: mvn -B -U -Dbuild.arch=${{ inputs.build-arch }} -Dio.cryostat.core.version=${{ inputs.test-version }} clean package
+    - run: mvn -B -U -Dbuild.arch=${{ inputs.build-arch }} -Dio.cryostat.core.version=${{ inputs.core-version }} clean package
       env:
         GITHUB_TOKEN_REF: ${{ secrets.GITHUB_TOKEN }}
     - name: Save cryostat image
@@ -51,6 +45,3 @@ jobs:
       with:
         name: cryostat-${{ inputs.build-arch }}
         path: ${{ github.workspace }}/cryostat-${{ inputs.build-arch }}.tar
-    - uses: skjolber/maven-cache-github-action@v1
-      with:
-        step: save