Merge pull request #46977 from crazy-max/fix-push-tag
ci(bin-image): fix merge job run condition
This commit is contained in:
commit
46f7ab808b
2 changed files with 1 additions and 3 deletions
2
.github/workflows/bin-image.yml
vendored
2
.github/workflows/bin-image.yml
vendored
|
@ -144,9 +144,9 @@ jobs:
|
||||||
|
|
||||||
merge:
|
merge:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
if: github.event_name != 'pull_request' && github.repository == 'moby/moby'
|
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
|
if: always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && github.event_name != 'pull_request' && github.repository == 'moby/moby'
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Download meta bake definition
|
name: Download meta bake definition
|
||||||
|
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -10,8 +10,6 @@ on:
|
||||||
branches:
|
branches:
|
||||||
- 'master'
|
- 'master'
|
||||||
- '[0-9]+.[0-9]+'
|
- '[0-9]+.[0-9]+'
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
|
Loading…
Reference in a new issue