Merge pull request #3663 from crazy-max/v0.11_backport_ci-release-bra…

…nches [0.11 backport] ci: trigger workflows on push to release branches
moby · Feb 23, 2023 · 9665de4 · 9665de4
2 parents 4ddee42 + 9ec2faa
commit 9665de4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,13 +11,11 @@ on:
   push:
     branches:
       - 'master'
+      - 'v[0-9]+.[0-9]+'
     tags:
       - 'v*'
       - 'dockerfile/*'
   pull_request:
-    branches:
-      - 'master'
-      - 'v*'
     paths-ignore:
       - 'README.md'
       - 'docs/**'
@@ -347,7 +345,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 "tag=${TAG}" >>${GITHUB_OUTPUT}
           echo "push=${PUSH}" >>${GITHUB_OUTPUT}
@@ -460,7 +460,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 "typ=${TYP}" >>${GITHUB_OUTPUT}

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -9,13 +9,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"