From 263b0b64017478d5738af1d5465ced606f3659e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 04:44:49 +0000
Subject: [PATCH 1/4] build(deps): bump docker/bake-action from 5 to 6

Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5 to 6.
- [Release notes](https://github.com/docker/bake-action/releases)
- [Commits](https://github.com/docker/bake-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/bake-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/_docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
index b193e11..4d7768b 100644
--- a/.github/workflows/_docker-build.yml
+++ b/.github/workflows/_docker-build.yml
@@ -77,7 +77,7 @@ jobs:
       # https://github.com/docker/bake-action/pull/247
       - name: List targets
         id: list-target
-        uses: docker/bake-action/subaction/list-targets@v5
+        uses: docker/bake-action/subaction/list-targets@v6
         with:
           files: arg.json,docker-bake.hcl
           target: ${{ inputs.target }}
@@ -127,7 +127,7 @@ jobs:
 
       - name: Build and push Docker image
         id: bake
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           files: |
             ${{ github.workspace }}/arg.json

From 825ce36130c0da6eda337d7a242a7bfc356a87bc Mon Sep 17 00:00:00 2001
From: Yuanhao Ji <jiyuanhao@apache.org>
Date: Mon, 13 Jan 2025 14:34:12 +0800
Subject: [PATCH 2/4] Use the local bake definition

---
 .github/workflows/_docker-build.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
index 4d7768b..9570c90 100644
--- a/.github/workflows/_docker-build.yml
+++ b/.github/workflows/_docker-build.yml
@@ -73,14 +73,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # TODO(shink): Improve files once this PR merged
-      # https://github.com/docker/bake-action/pull/247
       - name: List targets
         id: list-target
         uses: docker/bake-action/subaction/list-targets@v6
         with:
-          files: arg.json,docker-bake.hcl
           target: ${{ inputs.target }}
+          files: |
+            arg.json
+            docker-bake.hcl
 
   docker:
     name: 'docker'
@@ -129,6 +129,7 @@ jobs:
         id: bake
         uses: docker/bake-action@v6
         with:
+          source: ${{ github.workspace }}
           files: |
             ${{ github.workspace }}/arg.json
             ${{ github.workspace }}/docker-bake.hcl

From c68372b44b0fad74a0f618db510c5f108540fbef Mon Sep 17 00:00:00 2001
From: Yuanhao Ji <jiyuanhao@apache.org>
Date: Mon, 13 Jan 2025 14:36:52 +0800
Subject: [PATCH 3/4] update

---
 .github/workflows/_docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
index 9570c90..1b514be 100644
--- a/.github/workflows/_docker-build.yml
+++ b/.github/workflows/_docker-build.yml
@@ -129,7 +129,7 @@ jobs:
         id: bake
         uses: docker/bake-action@v6
         with:
-          source: ${{ github.workspace }}
+          source: .
           files: |
             ${{ github.workspace }}/arg.json
             ${{ github.workspace }}/docker-bake.hcl

From 8c93dc3a2fb1ca0c970a6901ac93181bc31aafec Mon Sep 17 00:00:00 2001
From: Yuanhao Ji <jiyuanhao@apache.org>
Date: Mon, 13 Jan 2025 14:44:04 +0800
Subject: [PATCH 4/4] update

---
 .github/workflows/docker.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c22b048..7f429a5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -72,7 +72,7 @@ jobs:
     name: python
     needs:
       - prepare
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'python')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'python')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'python'
@@ -88,7 +88,7 @@ jobs:
     needs:
       - prepare
       - python
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'cann')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'cann')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'cann'
@@ -100,7 +100,7 @@ jobs:
     needs:
       - prepare
       - cann
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'pytorch')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'pytorch')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'pytorch'
@@ -112,7 +112,7 @@ jobs:
     needs:
       - prepare
       - cann
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'mindspore')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'mindspore')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'mindspore'