From 5a51099f1aa3cd0d50c320fcefe2d4edc92bad51 Mon Sep 17 00:00:00 2001
From: Mauro Morales <mauro.morales@spectrocloud.com>
Date: Thu, 22 Jun 2023 11:29:39 +0200
Subject: [PATCH] Do not use merge commit

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
---
 .github/workflows/image.yaml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index da5d6f2a6..d20cbd604 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -21,6 +21,8 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - id: set-matrix
@@ -48,6 +50,8 @@ jobs:
       matrix: ${{fromJson(needs.get-matrix.outputs.matrix)}}
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: setup-docker
@@ -137,6 +141,8 @@ jobs:
       matrix: ${{fromJson(needs.get-matrix.outputs.matrix)}}
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: Install Cosign
@@ -181,6 +187,8 @@ jobs:
           - flavor: opensuse-leap
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: Download artifacts
@@ -237,6 +245,8 @@ jobs:
           - flavor: "ubuntu"
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
@@ -269,6 +279,8 @@ jobs:
           - flavor: "ubuntu-22-lts"
     steps:
     - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
     - run: |
         git fetch --prune --unshallow
     - name: Download artifacts
@@ -294,6 +306,8 @@ jobs:
           - flavor: opensuse-tumbleweed # Kubo test needs systemd version 252+ which atm is not available in Leap
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: Download artifacts
@@ -335,6 +349,8 @@ jobs:
           - flavor: opensuse-leap
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: Download artifacts
@@ -377,6 +393,8 @@ jobs:
           - flavor: ubuntu
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: Install earthly
@@ -398,6 +416,8 @@ jobs:
           - flavor: opensuse-leap
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: Download artifacts
@@ -470,6 +490,8 @@ jobs:
           # - flavor: "ubuntu"
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch --prune --unshallow
       - name: Download artifacts
@@ -543,6 +565,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
       - name: Install Go
         uses: actions/setup-go@v4