From 55d96a1ce1dc9952e2b14571f5782e49cd49ed87 Mon Sep 17 00:00:00 2001
From: Atif Ali <atali@redhat.com>
Date: Mon, 30 Oct 2023 12:32:03 -0400
Subject: [PATCH] fix1

---
 .github/workflows/ci-build-image.yml | 11 +----------
 .github/workflows/push-ci.yml        |  6 +++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
index a0b20983d0..136ff23c00 100644
--- a/.github/workflows/ci-build-image.yml
+++ b/.github/workflows/ci-build-image.yml
@@ -63,16 +63,7 @@ jobs:
     - name: maven-settings
       uses: s4u/maven-settings-action@v2
       with:
-        githubServer: false
-    - name: ghcr login
-      uses: redhat-actions/podman-login@v1
-      with:
-        registry: ghcr.io/${{ github.repository_owner }}
-        username: ${{ github.event.comment.user.login }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - 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
diff --git a/.github/workflows/push-ci.yml b/.github/workflows/push-ci.yml
index e6a5acfe6f..6ca6620f2f 100644
--- a/.github/workflows/push-ci.yml
+++ b/.github/workflows/push-ci.yml
@@ -20,13 +20,13 @@ jobs:
       checkout-ref: ${{ github.event.pull_request.head.ref }}
     secrets: inherit
     
-  build-and-test-amd64:
+  build-amd64:
     uses: ./.github/workflows/ci-build-image.yml
     secrets: inherit
     with:
       build-arch: amd64
     
-  build-and-test-arm64:
+  build-arm64:
     uses: ./.github/workflows/ci-build-image.yml
     secrets: inherit
     with:
@@ -34,7 +34,7 @@ jobs:
     
   push-to-quay:
     runs-on: ubuntu-latest
-    needs: [code-analysis, build-and-test-amd64, build-and-test-arm64]
+    needs: [code-analysis, build-amd64, build-arm64]
     env:
       CRYOSTAT_IMG: quay.io/cryostat/cryostat
     if: always()