From f4f819fbece3f15ece91958ed0c30ebf69eebe12 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Wed, 24 Jan 2024 11:36:15 -0800 Subject: [PATCH 1/3] =?UTF-8?q?Bump=2024.0.7=20=E2=86=92=2025.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Dubois --- .github/workflows/package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 506159c..2ee81c6 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -8,7 +8,7 @@ on: TAG: description: Docker CLI tag to build required: true - default: v24.0.7 + default: v25.0.1 defaults: run: From c6642bd2deeec665a63409d9fbe9bf2de962a2d5 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Tue, 23 Jan 2024 22:15:53 -0800 Subject: [PATCH 2/3] Add Windows and Linux arm64 artifacts Signed-off-by: Jan Dubois --- .github/workflows/package.yaml | 49 +++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 2ee81c6..cf14729 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -97,18 +97,40 @@ jobs: - run: mv ./build/docker-linux-amd64 ./build/docker-wsl-amd64 + - name: Build WSL arm64 + uses: docker/bake-action@v2.2.0 + with: + set: | + binary.platform=linux/arm64 + binary.args.GO_LDFLAGS=-X github.com/docker/cli/cli/config/credentials.LinuxCredentialsStoreDefaultOverride=wincred.exe + workdir: cli + + - run: mv ./build/docker-linux-arm64 ./build/docker-wsl-arm64 + - name: Build linux amd64 uses: docker/bake-action@v2.2.0 with: set: binary.platform=linux/amd64 workdir: cli + - name: Build linux arm64 + uses: docker/bake-action@v2.2.0 + with: + set: binary.platform=linux/arm64 + workdir: cli + - name: Build windows amd64 uses: docker/bake-action@v2.2.0 with: set: binary.platform=windows/amd64 workdir: cli + - name: Build windows arm64 + uses: docker/bake-action@v2.2.0 + with: + set: binary.platform=windows/arm64 + workdir: cli + - name: Calculate Checksums working-directory: cli/build run: sha256sum docker-* > sha256sum.txt @@ -128,26 +150,47 @@ jobs: if-no-files-found: error - uses: actions/upload-artifact@v2 - name: Upload Linux artifact + name: Upload Linux amd64 artifact with: name: docker-linux-amd64 path: cli/build/docker-linux-amd64 if-no-files-found: error - uses: actions/upload-artifact@v2 - name: Upload Windows artifact + name: Upload Linux arm64 artifact + with: + name: docker-linux-arm64 + path: cli/build/docker-linux-arm64 + if-no-files-found: error + + - uses: actions/upload-artifact@v2 + name: Upload Windows amd64 artifact with: name: docker-windows-amd64 path: cli/build/docker-windows-amd64.exe if-no-files-found: error - uses: actions/upload-artifact@v2 - name: Upload WSL artifact + name: Upload WSL amd64 artifact with: name: docker-wsl-amd64 path: cli/build/docker-wsl-amd64 if-no-files-found: error + - uses: actions/upload-artifact@v2 + name: Upload Windows arm64 artifact + with: + name: docker-windows-arm64 + path: cli/build/docker-windows-arm64.exe + if-no-files-found: error + + - uses: actions/upload-artifact@v2 + name: Upload WSL arm64 artifact + with: + name: docker-wsl-arm64 + path: cli/build/docker-wsl-arm64 + if-no-files-found: error + - uses: actions/upload-artifact@v2 name: Upload checksums with: From ac38e7a5ab028db8a9b81399bcc378aad961f697 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Wed, 24 Jan 2024 11:37:46 -0800 Subject: [PATCH 3/3] Check event name for workflow_dispatch This is not a functional change since the `inputs` context is only populated for `workflow_dispatch` events anyways, but makes it a bit clearer for the casual reader. Signed-off-by: Jan Dubois --- .github/workflows/package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index cf14729..059fd16 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -33,7 +33,7 @@ jobs: working-directory: . - name: Set Docker CLI tag from inputs - if: inputs.TAG + if: github.event_name == 'workflow_dispatch' run: echo "DOCKER_CLI_REF=${{ inputs.TAG }}" >> "${GITHUB_ENV}" working-directory: .