From e9951917800f815ffa3673f6ad9e02f4ddff9d97 Mon Sep 17 00:00:00 2001
From: Justin Chadwell <me@jedevc.com>
Date: Mon, 17 Jul 2023 14:15:57 +0100
Subject: [PATCH] ci: extract buildkit version correctly with replace-d modules

Signed-off-by: Justin Chadwell <me@jedevc.com>
(cherry picked from commit f8c0d92a22bad004cb9cbb4db704495527521c42)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .github/workflows/buildkit.yml | 2 +-
 hack/buildkit-ref              | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
index eb3f186622..2d03c03b7c 100644
--- a/.github/workflows/buildkit.yml
+++ b/.github/workflows/buildkit.yml
@@ -69,7 +69,7 @@ jobs:
       -
         name: BuildKit ref
         run: |
-          echo "BUILDKIT_REF=$(./hack/buildkit-ref)" >> $GITHUB_ENV
+          echo "$(./hack/buildkit-ref)" >> $GITHUB_ENV
         working-directory: moby
       -
         name: Checkout BuildKit ${{ env.BUILDKIT_REF }}
diff --git a/hack/buildkit-ref b/hack/buildkit-ref
index 6f497c29ae..b5991ad04e 100755
--- a/hack/buildkit-ref
+++ b/hack/buildkit-ref
@@ -10,7 +10,10 @@ if [ -n "$BUILDKIT_REF" ]; then
 fi
 
 # get buildkit version from vendor.mod
-BUILDKIT_REF=$(./hack/with-go-mod.sh go list -mod=mod -modfile=vendor.mod -u -m -f '{{.Version}}' "github.com/${BUILDKIT_REPO}")
+BUILDKIT_REF=$(./hack/with-go-mod.sh go list -mod=mod -modfile=vendor.mod -u -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' "github.com/${BUILDKIT_REPO}")
+BUILDKIT_REPO=$(./hack/with-go-mod.sh go list -mod=mod -modfile=vendor.mod -u -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' "github.com/${BUILDKIT_REPO}")
+BUILDKIT_REPO=${BUILDKIT_REPO#github.com/}
+
 if [[ "${BUILDKIT_REF}" == *-*-* ]]; then
 	# if pseudo-version, figure out just the uncommon sha (https://github.com/golang/go/issues/34745)
 	BUILDKIT_REF=$(echo "${BUILDKIT_REF}" | awk -F"-" '{print $NF}' | awk 'BEGIN{FIELDWIDTHS="7"} {print $1}')
@@ -18,4 +21,5 @@ if [[ "${BUILDKIT_REF}" == *-*-* ]]; then
 	BUILDKIT_REF=$(curl -s "https://api.github.com/repos/${BUILDKIT_REPO}/commits/${BUILDKIT_REF}" | jq -r .sha)
 fi
 
-echo "$BUILDKIT_REF"
+echo "BUILDKIT_REPO=$BUILDKIT_REPO"
+echo "BUILDKIT_REF=$BUILDKIT_REF"