From a1acf942e55b34ce7dca62da479bb33b552ea6ae Mon Sep 17 00:00:00 2001 From: Ming Wang Date: Tue, 28 Nov 2023 10:34:06 -0500 Subject: [PATCH 1/4] CI fix --- .github/workflows/ci-build-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml index b1c2864a03..a512b5a296 100644 --- a/.github/workflows/ci-build-image.yml +++ b/.github/workflows/ci-build-image.yml @@ -38,6 +38,7 @@ jobs: runs-on: ubuntu-latest permissions: pull-requests: write + packages: read needs: [get-pom-properties] steps: - name: Install qemu From 87c9e7fce0366df7de76808d68a95f595d3ca421 Mon Sep 17 00:00:00 2001 From: Ming Wang Date: Tue, 28 Nov 2023 10:46:45 -0500 Subject: [PATCH 2/4] replace github_token_ref --- .github/workflows/ci-build-image.yml | 3 +-- .github/workflows/ci-code-analysis.yml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml index a512b5a296..664875b579 100644 --- a/.github/workflows/ci-build-image.yml +++ b/.github/workflows/ci-build-image.yml @@ -38,7 +38,6 @@ jobs: runs-on: ubuntu-latest permissions: pull-requests: write - packages: read needs: [get-pom-properties] steps: - name: Install qemu @@ -68,7 +67,7 @@ jobs: - 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 diff --git a/.github/workflows/ci-code-analysis.yml b/.github/workflows/ci-code-analysis.yml index 703988981b..9e5bea8236 100644 --- 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 From 4f4c6a05ff8f098636737c56ee6634f37425fcd1 Mon Sep 17 00:00:00 2001 From: Ming Wang Date: Tue, 28 Nov 2023 10:58:32 -0500 Subject: [PATCH 3/4] cache maven files --- .github/workflows/ci-build-image.yml | 15 ++++++++------- .github/workflows/integrated-test.yml | 7 +++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml index 664875b579..398e1c86bb 100644 --- a/.github/workflows/ci-build-image.yml +++ b/.github/workflows/ci-build-image.yml @@ -56,13 +56,17 @@ 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 @@ -74,6 +78,3 @@ jobs: 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/integrated-test.yml b/.github/workflows/integrated-test.yml index ea05e74748..bcdf669e98 100644 --- 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: From b7e77ed7e54b7fc2fc68f714893ca1d6fa7e5da6 Mon Sep 17 00:00:00 2001 From: Ming Wang Date: Tue, 28 Nov 2023 11:00:21 -0500 Subject: [PATCH 4/4] remove permissions --- .github/workflows/ci-build-image.yml | 2 -- .github/workflows/pr-ci.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml index 398e1c86bb..4e4826cef2 100644 --- 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 diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index b4440c5ba0..6fa766bef7 100644 --- 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 }}