Merge branch 'master' into dev

This commit is contained in:
Koen Kanters
2020-08-11 21:27:18 +02:00
+2 -2
View File
@@ -28,10 +28,10 @@ jobs:
- name: Lint
run: npm run eslint
- name: Docker login
if: (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name == 'push'
if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
run: echo ${{ secrets.DOCKER_KEY }} | docker login -u koenkk --password-stdin
- name: Docker setup
if: (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name == 'push'
if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
run: |
sudo wget -O /usr/local/bin/buildx https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64
sudo chmod a+x /usr/local/bin/buildx