From 8b33bee541e7f973bd772b671f6c49df407e07b7 Mon Sep 17 00:00:00 2001
From: Kyle Harding <kyle@balena.io>
Date: Fri, 2 Dec 2022 08:57:35 -0500
Subject: [PATCH] Remove the checkout ref until it can be fixed properly

This will break external contributions but will
unblock internal tasks.

Change-type: patch
Signed-off-by: Kyle Harding <kyle@balena.io>
---
 .github/workflows/flowzone.yml | 2 --
 flowzone.yml                   | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index 19fb20ee3..d2b961f8c 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -262,7 +262,6 @@ jobs:
           fetch-depth: ${{ inputs.checkout_fetch_depth }}
           submodules: recursive
           token: ${{ secrets.FLOWZONE_TOKEN }}
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.event.head_commit.id }}
       - name: Convert balena_slugs to a JSON array
         id: balena_slugs
         uses: kanga333/json-array-builder@v0.2.1
@@ -607,7 +606,6 @@ jobs:
           fetch-depth: 0
           submodules: recursive
           token: ${{ secrets.FLOWZONE_TOKEN }}
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.event.head_commit.id }}
       - name: Reject merge commits
         run: |
           if [ "$(git cat-file -p ${{ github.event.pull_request.head.sha || github.event.head_commit.id }} | grep '^parent ' | wc -l)" -gt 1 ]
diff --git a/flowzone.yml b/flowzone.yml
index 4c22661cd..34f28a20f 100644
--- a/flowzone.yml
+++ b/flowzone.yml
@@ -308,7 +308,6 @@ jobs:
           fetch-depth: ${{ inputs.checkout_fetch_depth }}
           submodules: "recursive"
           token: ${{ secrets.FLOWZONE_TOKEN }}
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.event.head_commit.id }}
 
       - name: Convert balena_slugs to a JSON array
         id: balena_slugs
@@ -703,9 +702,6 @@ jobs:
           fetch-depth: 0
           submodules: "recursive"
           token: ${{ secrets.FLOWZONE_TOKEN }}
-          # we need the merge commit in the checkout in order to push versioned changes
-          # otherwise our branch appears to be behind upstream
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.event.head_commit.id }}
 
       # fail on merge commits (ones with more than one parent)
       - name: Reject merge commits