From cfa2f9a2f2170e5fc7d99af4f0f1c6adefc7f9f2 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 20 Oct 2022 23:10:19 +0200
Subject: [PATCH 1/2] gha: buildkit: remove "skip-integration-tests" from
 matrix

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .github/workflows/buildkit.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
index a9aec38ce4..c57e129c13 100644
--- a/.github/workflows/buildkit.yml
+++ b/.github/workflows/buildkit.yml
@@ -59,9 +59,6 @@ jobs:
           - ./frontend/dockerfile
         typ:
           - integration
-        include:
-          - pkg: ./...
-            skip-integration-tests: 1
     steps:
       -
         name: Checkout
@@ -112,5 +109,4 @@ jobs:
           TEST_DOCKERD_BINARY: "./build/moby/binary-daemon/dockerd"
           TESTPKGS: "${{ matrix.pkg }}"
           TESTFLAGS: "-v --parallel=1 --timeout=30m --run=//worker=dockerd$"
-          SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
         working-directory: buildkit

From 0760c6f4e1f9f277e0d6027345fd76616f18ab3a Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 20 Oct 2022 23:18:44 +0200
Subject: [PATCH 2/2] gha: buildkit: make checks more readable

GitHub uses these parameters to construct a name; removing the ./ prefix
to make them more readable (and add them back where it's used)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .github/workflows/buildkit.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
index c57e129c13..57877b7796 100644
--- a/.github/workflows/buildkit.yml
+++ b/.github/workflows/buildkit.yml
@@ -52,11 +52,11 @@ jobs:
       fail-fast: false
       matrix:
         pkg:
-          - ./client
-          - ./cmd/buildctl
-          - ./solver
-          - ./frontend
-          - ./frontend/dockerfile
+          - client
+          - cmd/buildctl
+          - solver
+          - frontend
+          - frontend/dockerfile
         typ:
           - integration
     steps:
@@ -107,6 +107,6 @@ jobs:
           CONTEXT: "."
           TEST_DOCKERD: "1"
           TEST_DOCKERD_BINARY: "./build/moby/binary-daemon/dockerd"
-          TESTPKGS: "${{ matrix.pkg }}"
+          TESTPKGS: "./${{ matrix.pkg }}"
           TESTFLAGS: "-v --parallel=1 --timeout=30m --run=//worker=dockerd$"
         working-directory: buildkit