From 1243d54ef955e8274668b580e25b97885e97fefd Mon Sep 17 00:00:00 2001 From: Krishna Harsha Voora Date: Mon, 6 Nov 2023 22:03:29 +0530 Subject: [PATCH] Updates the GHA workflows Signed-off-by: Krishna Harsha Voora --- .github/workflows/build-container.yml | 7 +++---- Makefile | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 5261a1e2..fc78955f 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -28,23 +28,22 @@ jobs: if: runner.os == 'Linux' - name: Clone Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Golang - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VER }} - name: Login to the ${{ env.CONTAINER_REGISTRY }} Container Registry run: podman login quay.io -u ${QUAY_USER} -p ${QUAY_TOKEN} - with: + env: QUAY_USER: ${{ secrets.QUAY_USER }} QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: Build and Push multi-arch Image id: push run: | - make gha-build make gha-push env: GO_VER: ${{ env.GO_VER }} \ No newline at end of file diff --git a/Makefile b/Makefile index 0964b6fe..2f2b52eb 100644 --- a/Makefile +++ b/Makefile @@ -27,13 +27,13 @@ container-build: build --build-arg RHEL_VERSION=$(RHEL_VERSION) \ -t $(CONTAINER_NS)/$(BIN) ./containers -gha-build: build +gha-build: @echo "Building the container image for GHA" $(CONTAINER_BUILD) -f containers/Containerfile \ --build-arg RHEL_VERSION=$(RHEL_VERSION) --platform=linux/amd64,linux/arm64,linux/ppc64le,linux/s390x \ -t $(CONTAINER_NS) ./containers --manifest=$(CONTAINER_NS):latest -gha-push: gha-build +gha-push: build gha-build @echo "Pushing Container Images & manifest" $(CONTAINER_BUILD) manifest push