From 025b1c7c9e5b64457eea60eed6adafa511187469 Mon Sep 17 00:00:00 2001 From: Abdul Rabbani Date: Wed, 18 May 2022 14:45:55 -0400 Subject: [PATCH] Combine the build and push steps. --- .github/workflows/on-master.yaml | 25 ------------------------- .github/workflows/publish.yaml | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/on-master.yaml diff --git a/.github/workflows/on-master.yaml b/.github/workflows/on-master.yaml deleted file mode 100644 index aa7c66e6..00000000 --- a/.github/workflows/on-master.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: Docker Compose Build - -on: - push: - branches: - - master - -jobs: - build: - name: Run docker build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Get the version - id: vars - run: echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) - - name: Run docker build - run: make docker-build - - name: Tag docker image - run: docker tag vulcanize/ipld-eth-server docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - - name: Docker Login - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin - - name: Docker Push - run: docker push docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 42450ce7..2315bc22 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,9 +3,27 @@ on: release: types: [published] jobs: + build: + name: Run docker build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Get the version + id: vars + run: echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) + - name: Run docker build + run: make docker-build + - name: Tag docker image + run: docker tag vulcanize/ipld-eth-server docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + - name: Docker Login + run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin + - name: Docker Push + run: docker push docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + push_to_registries: name: Push Docker image to Docker Hub runs-on: ubuntu-latest + needs: build steps: - name: Get the version id: vars @@ -22,4 +40,3 @@ jobs: run: docker tag docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} vulcanize/ipld-eth-server:${{steps.vars.outputs.tag}} - name: Docker Push to Docker Hub run: docker push vulcanize/ipld-eth-server:${{steps.vars.outputs.tag}} -