Skip to content

Commit

Permalink
Merge pull request #3662 from crazy-max/v0.10_backport_ci-release-bra…
Browse files Browse the repository at this point in the history
…nches

[0.10 backport] ci: trigger workflows on push to release branches
  • Loading branch information
crazy-max authored Feb 23, 2023
2 parents 852f199 + 690ee5e commit 098fd86
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ on:
push:
branches:
- 'master'
- 'v[0-9]+.[0-9]+'
tags:
- 'v*'
- 'dockerfile/*'
pull_request:
branches:
- 'master'
- 'v*'

env:
REPO_SLUG_ORIGIN: "moby/buildkit:v0.10.0-rc1"
Expand Down Expand Up @@ -243,7 +241,9 @@ jobs:
PUSH=push
elif [[ $GITHUB_REF == refs/heads/* ]]; then
TAG=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
PUSH=push
if [ $GITHUB_REF = "refs/heads/${{ github.event.repository.default_branch }}" ]; then
PUSH=push
fi
fi
echo ::set-output name=tag::${TAG}
echo ::set-output name=push::${PUSH}
Expand Down Expand Up @@ -358,7 +358,7 @@ jobs:
TYP=tag
TAG=${GITHUB_REF#refs/tags/}
PUSH=push
elif [[ $GITHUB_REF == refs/heads/* ]]; then
elif [ $GITHUB_REF = "refs/heads/${{ github.event.repository.default_branch }}" ]; then
PUSH=push
fi
echo ::set-output name=typ::${TYP}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ on:
push:
branches:
- 'master'
- 'v[0-9]+.[0-9]+'
tags:
- 'v*'
- 'dockerfile/*'
pull_request:
branches:
- 'master'
- 'v*'

env:
REPO_SLUG_ORIGIN: "moby/buildkit:latest"
Expand Down

0 comments on commit 098fd86

Please sign in to comment.