From 01013cf926da3f77c163f14d4a43530b5326c035 Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Fri, 7 Aug 2020 23:12:47 -0400 Subject: [PATCH] Combine jobs within workflows --- .github/workflows/docker.yml | 11 +++-------- .github/workflows/sphinx.yml | 10 ++-------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ee5e4105..5388f955 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -48,21 +48,16 @@ jobs: env: COMMIT_MSG: "${{github.event.head_commit.message}}" WIKI_PATH: ../wiki - - push: - name: Push Docker Images - runs-on: ubuntu-latest - needs: - - build - if: github.ref == 'refs/heads/master' - steps: - name: Login to Docker Hub + if: github.ref == 'refs/heads/master' run: > echo '${{secrets.DOCKERHUB_PASSWORD}}' | docker login --username '${{secrets.DOCKERHUB_USERNAME}}' --password-stdin - name: Push Images to DockerHub + if: github.ref == 'refs/heads/master' run: make -C main push-all - name: Push Wiki to GitHub + if: github.ref == 'refs/heads/master' run: make -C main git-commit env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml index caf473c5..23bdc654 100644 --- a/.github/workflows/sphinx.yml +++ b/.github/workflows/sphinx.yml @@ -30,20 +30,14 @@ jobs: make dev-env - name: Build Documentation run: make docs - - gettext: - name: Update Translation Source Strings - runs-on: ubuntu-latest - needs: - - build - if: github.ref == 'refs/heads/master' - steps: - name: Extract Source Strings + if: github.ref == 'refs/heads/master' working-directory: docs run: | make gettext sphinx-intl update -p _build/gettext -l en - name: Push Strings to Master + if: github.ref == 'refs/heads/master' run: make git-commit env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}