From fec7ce2131ef37fbf34cc7f6dfb54280606d3718 Mon Sep 17 00:00:00 2001
From: Martin Necas <mnecas@redhat.com>
Date: Mon, 20 Jan 2025 13:43:05 +0100
Subject: [PATCH] Fix upstream build and push CI job

Signed-off-by: Martin Necas <mnecas@redhat.com>
---
 .github/workflows/build-push-images.yml | 13 +++++++++----
 .github/workflows/pull-request.yml      |  2 --
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-push-images.yml b/.github/workflows/build-push-images.yml
index cd9d9367e..e7e44c8c1 100644
--- a/.github/workflows/build-push-images.yml
+++ b/.github/workflows/build-push-images.yml
@@ -5,6 +5,9 @@ on:
     branches:
       - main
       - release-*
+  pull_request:
+    branches:
+      - main
   workflow_dispatch:
 
 jobs:
@@ -36,7 +39,9 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
-      - name: Build and push images to quay.io
-        run: |
-          cd ${GITHUB_WORKSPACE}
-          make push-all-images
+      - name: Build and push virt-v2v image to quay.io
+        uses: docker/build-push-action@v6
+        with:
+          file: "{context}/virt-v2v/Containerfile-upstream"
+          push: true
+          tags: mnecas0/forklift-virt-v2v:$REGISTRY_ORG
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index fc2bc51a8..7d53cbfc8 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -4,8 +4,6 @@ name: CI
 # Controls when the action will run. 
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]