summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2023-02-06 10:59:50 +0100
committerSebastiaan van Stijn <github@gone.nl>2023-02-06 18:08:45 +0100
commite56493279296a0426f60e4a7702bc8be2d676e04 (patch)
treeb5fc4d853d3ed9759c97921cef148ef6805b1315 /.github/workflows
parentdee7ff4a92dbde48a6ee11e3e75a2a1b41239641 (diff)
downloaddocker-e56493279296a0426f60e4a7702bc8be2d676e04.tar.gz
gha: switch buildkit back to upstream for testing
commit 043dbc05dfacfe3d8bc2e7297fa78e861c89cd85 temporarily switched to a fork of BuildKit to workaround a failure in CI. These fixes have been backported to the v0.11 branch in BuildKit, so we can switch back to upstream. We can remove this override once we update vendor.mod to BuildKit v0.11.3. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/buildkit.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
index fdd7633cfa..93fb09611e 100644
--- a/.github/workflows/buildkit.yml
+++ b/.github/workflows/buildkit.yml
@@ -69,11 +69,10 @@ jobs:
-
name: BuildKit ref
run: |
- # FIXME(tonistiigi) test suite needs patch moby/buildkit#3567
- # echo "BUILDKIT_REPO=moby/buildkit" >> $GITHUB_ENV
+ echo "BUILDKIT_REPO=moby/buildkit" >> $GITHUB_ENV
+ # FIXME(thaJeztah) remove when updating BuildKit to v0.11.3
# echo "BUILDKIT_REF=$(./hack/buildkit-ref)" >> $GITHUB_ENV
- echo "BUILDKIT_REPO=tonistiigi/buildkit" >> $GITHUB_ENV
- echo "BUILDKIT_REF=db67180a1a439efb1547ecf5decd4003ec8f621b" >> $GITHUB_ENV
+ echo "BUILDKIT_REF=09223a2c58d06e0333b48107be5490397d11e65a" >> $GITHUB_ENV
working-directory: moby
-
name: Checkout BuildKit ${{ env.BUILDKIT_REF }}