summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2021-05-02 14:53:12 -0400
committerDave Henderson <dhenderson@gmail.com>2021-05-02 14:53:12 -0400
commit729a710d6c24d502e31e9ae411e74df3e33fa5e3 (patch)
tree8401d0ad620b06aa60b7d531875f3fe486274b49 /.github
parentec70cee73da69fd53838f9a164e08d9bb0c6a9cc (diff)
ci: further tweaks
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml6
-rw-r--r--.github/workflows/docker.yml2
2 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 23c4f73a..90c17af2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,9 @@
name: Build
-on: [push]
+on:
+ push:
+ branches:
+ - master
+ pull_request:
jobs:
linux-build:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 25a40747..51ada4c6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -57,7 +57,7 @@ jobs:
run: |
# NOTE: DOCKERHUB_TOKEN and DOCKERHUB_USERNAME must be present in https://github.com/hairyhenderson/gomplate/settings
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
- if: github.repository == 'hairyhenderson/gomplate' && github.ref == 'refs/heads/master'
+ if: github.repository == 'hairyhenderson/gomplate' && (github.ref == 'refs/heads/master' || env.is_tag == 'true')
- name: Build & Push (master)
run: |
make docker-multi COMMIT=${{ github.sha }} DOCKER_REPO=hairyhenderson/gomplate BUILDX_ACTION=--push