diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-08-03 23:28:13 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-08-03 23:28:13 +0200 |
commit | ffa6674637a5bf906d78ae6675f9a4680a78ab7b (patch) | |
tree | 42a5dcd36a08c1c98921d8001a0106a6ea97eca0 | |
parent | 2899ca8f391cc6d55455b4e29d153f32e53acdaa (diff) |
build: Merge jobs as data is not shared between them
-rw-r--r-- | .github/workflows/ci.yml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cace52..aea27d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,9 @@ on: jobs: build: runs-on: ubuntu-latest + env: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} steps: - uses: actions/checkout@v2 - name: install go @@ -17,17 +20,11 @@ jobs: go-version: 1.16 - name: build and test run: make - deploy: - if: ${{ github.ref == 'refs/heads/master' }} - needs: build - runs-on: ubuntu-latest - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - steps: - name: enable experimental docker features + if: ${{ github.ref == 'refs/heads/master' }} run: | echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json sudo service docker restart - name: publish multi-arch docker image + if: ${{ github.ref == 'refs/heads/master' }} run: make docker-pushx |