fix(CI): fix workflow bug (#1798)

cryostatio · Nov 28, 2023 · 59c2212 · 59c2212
1 parent fa6436f
commit 59c2212
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
@@ -36,8 +36,6 @@ jobs:
 
   build-image:
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
     needs: [get-pom-properties]
     steps:
     - name: Install qemu
@@ -56,24 +54,25 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
+    - uses: actions/cache@v3
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-build-
+          ${{ runner.os }}-
     - name: maven-settings
       uses: s4u/maven-settings-action@v2
       with:
-        githubServer: false
-    - uses: skjolber/maven-cache-github-action@v1
-      with:
-        step: restore
+        githubServer: true
     - run: git submodule init
     - run: git submodule update
     - run: mvn -B -U -Dbuild.arch=${{ inputs.build-arch }} clean package
       env:
-        GITHUB_TOKEN_REF: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Save cryostat image
       run: podman save -o cryostat-${{ inputs.build-arch }}.tar --format oci-archive quay.io/cryostat/cryostat
     - uses: actions/upload-artifact@v3
       with:
         name: cryostat-${{ inputs.build-arch }}
         path: /home/runner/work/cryostat/cryostat/cryostat-${{ inputs.build-arch }}.tar
-    - uses: skjolber/maven-cache-github-action@v1
-      with:
-        step: save
diff --git a/.github/workflows/ci-code-analysis.yml b/.github/workflows/ci-code-analysis.yml
@@ -38,12 +38,12 @@ jobs:
     - name: maven-settings
       uses: s4u/maven-settings-action@v2
       with:
-        servers: '[{"id": "github", "username": "dummy", "password": "${env.GITHUB_TOKEN_REF}"}]'
+        servers: '[{"id": "github", "username": "dummy", "password": "${env.GITHUB_TOKEN}"}]'
         githubServer: false
     - name: Run spotbugs
       run: mvn -B -U -Dheadless=true compile spotbugs:check
       env:
-        GITHUB_TOKEN_REF: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   shellcheck:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/integrated-test.yml b/.github/workflows/integrated-test.yml
@@ -47,6 +47,13 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
+    - uses: actions/cache@v3
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-build-
+          ${{ runner.os }}-
     - name: maven-settings
       uses: s4u/maven-settings-action@v2
       with:

diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
@@ -101,8 +101,6 @@ jobs:
     strategy:
       matrix:
         arch: [amd64, arm64]
-    permissions:
-      pull-requests: write
     uses: ./.github/workflows/ci-build-image.yml
     with:
       build-arch: ${{ matrix.arch }}