diff options
| author | CrazyMax <crazy-max@users.noreply.github.com> | 2022-12-26 17:45:50 +0100 |
|---|---|---|
| committer | CrazyMax <crazy-max@users.noreply.github.com> | 2023-01-01 18:03:03 +0100 |
| commit | 9bcf5bed05a47359258a731062a1756abbe1e914 (patch) | |
| tree | 66d6c06d15dadba51261e67454268037b9dab875 /.github/workflows | |
| parent | 491467b0b926b38888ad2239bbad96b71b35fa91 (diff) | |
| download | docker-9bcf5bed05a47359258a731062a1756abbe1e914.tar.gz | |
bake: define DESTDIR
Keep the same output dir format in the bake definition
as the one used in make scripts.
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/buildkit.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index baa27a7757..d131d9c9ba 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -13,7 +13,7 @@ on: pull_request: env: - BUNDLES_OUTPUT: ./bundles + DESTDIR: ./build jobs: validate-dco: @@ -40,7 +40,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: binary - path: ${{ env.BUNDLES_OUTPUT }} + path: ${{ env.DESTDIR }} if-no-files-found: error retention-days: 1 @@ -106,7 +106,7 @@ jobs: env: CONTEXT: "." TEST_DOCKERD: "1" - TEST_DOCKERD_BINARY: "./build/moby/binary-daemon/dockerd" + TEST_DOCKERD_BINARY: "./build/moby/dockerd" TESTPKGS: "./${{ matrix.pkg }}" TESTFLAGS: "-v --parallel=1 --timeout=30m --run=//worker=dockerd$" working-directory: buildkit diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a34abc2425..97ee4e73b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ on: pull_request: env: - BUNDLES_OUTPUT: ./bundles + DESTDIR: ./build jobs: validate-dco: @@ -50,7 +50,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ matrix.target }} - path: ${{ env.BUNDLES_OUTPUT }} + path: ${{ env.DESTDIR }} if-no-files-found: error retention-days: 7 @@ -110,6 +110,6 @@ jobs: uses: actions/upload-artifact@v3 with: name: cross-${{ env.PLATFORM_PAIR }} - path: ${{ env.BUNDLES_OUTPUT }} + path: ${{ env.DESTDIR }} if-no-files-found: error retention-days: 7 |