Skip to content

build(deps): bump docker/bake-action from 5 to 6 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dependabot merged 4 commits into from
Jan 13, 2025
Merged

build(deps): bump docker/bake-action from 5 to 6 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
263b0b6
build(deps): bump docker/bake-action from 5 to 6
dependabot[bot] Jan 13, 2025
825ce36
Use the local bake definition
shink Jan 13, 2025
c68372b
update
shink Jan 13, 2025
8c93dc3
update
shink Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/_docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@v5
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'
Expand Down Expand Up @@ -127,8 +127,9 @@ jobs:

- name: Build and push Docker image
id: bake
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
source: .

@shink shink Jan 13, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use the local bake definition due to the change in docker/bake-action#193

files: |
${{ github.workspace }}/arg.json
${{ github.workspace }}/docker-bake.hcl
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down