diff --git a/.github/workflows/dependency-update.yml b/.github/workflows/dependency-update.yml index 08ecece..604d7ab 100644 --- a/.github/workflows/dependency-update.yml +++ b/.github/workflows/dependency-update.yml @@ -22,3 +22,22 @@ jobs: env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + build: + runs-on: ubuntu-latest + if: github.event.pull_request.merged == true + steps: + - uses: actions/checkout@v3 + - + name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: build + uses: docker/build-push-action@v3 + with: + context: . + push: true + tags: andrewmhub/insurgency-sandstorm:latest \ No newline at end of file diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 81b1282..3fcaaa3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -64,23 +64,4 @@ jobs: run: git fetch origin master - name: push code to master if: steps.status.outcome == 'success' - run: git push origin HEAD:master - build: - runs-on: ubuntu-latest - if: github.event.pull_request.merged == true - steps: - - uses: actions/checkout@v3 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: build - uses: docker/build-push-action@v3 - with: - context: . - push: true - tags: andrewmhub/insurgency-sandstorm:latest \ No newline at end of file + run: git push origin HEAD:master \ No newline at end of file