[CI] Make docker image build when PR is merged into master branch

Signed-off-by: hydai <[email protected]>
Yoname · Jun 3, 2021 · 04255c9 · 04255c9
1 parent 142811b
commit 04255c9
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -8,6 +8,8 @@ on:
   push:
     tags:
       - '*.*.*'
+    branch:
+      - master
     paths:
       - 'utils/docker/**'
       - '.github/workflows/docker.yml'
@@ -46,10 +48,6 @@ jobs:
           elif [[ $GITHUB_REF == refs/pull/* ]]; then
           VERSION=pr-${{ github.event.number }}
           fi
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-          MINOR=${VERSION%.*}
-          MAJOR=${MINOR%.*}
-          fi
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -184,10 +182,6 @@ jobs:
           elif [[ $GITHUB_REF == refs/pull/* ]]; then
           VERSION=pr-${{ github.event.number }}
           fi
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-          MINOR=${VERSION%.*}
-          MAJOR=${MINOR%.*}
-          fi
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -248,10 +242,6 @@ jobs:
           elif [[ $GITHUB_REF == refs/pull/* ]]; then
           VERSION=pr-${{ github.event.number }}
           fi
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-          MINOR=${VERSION%.*}
-          MAJOR=${MINOR%.*}
-          fi
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -312,10 +302,6 @@ jobs:
           elif [[ $GITHUB_REF == refs/pull/* ]]; then
           VERSION=pr-${{ github.event.number }}
           fi
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-          MINOR=${VERSION%.*}
-          MAJOR=${MINOR%.*}
-          fi
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')