ci: try to deploy after daily jobs

This commit is contained in:
Christopher Willis-Ford 2024-02-23 15:41:31 -08:00
parent c45fea7887
commit 2f10033669
2 changed files with 5 additions and 12 deletions

View file

@ -4,6 +4,11 @@ on:
push: # Runs whenever a commit is pushed to the repository push: # Runs whenever a commit is pushed to the repository
workflow_call: # Allows another workflow to call this one workflow_call: # Allows another workflow to call this one
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
workflow_run: # Allows you to run this workflow when another workflow is run
types: [completed]
workflows:
- "Daily TX Pull"
- "Daily Help Update"
concurrency: concurrency:
group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}" group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
@ -18,8 +23,6 @@ permissions:
jobs: jobs:
build-and-deploy: build-and-deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
TRIGGER_DEPLOY: ${{ startsWith(github.ref, 'refs/heads/master') }}
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

View file

@ -20,9 +20,6 @@ jobs:
daily-tx-pull: daily-tx-pull:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs:
MADE_CHANGES: ${{ steps.commit.outputs.MADE_CHANGES }}
env: env:
# Organization-wide secrets # Organization-wide secrets
TX_TOKEN: ${{ secrets.TX_TOKEN }} TX_TOKEN: ${{ secrets.TX_TOKEN }}
@ -50,15 +47,8 @@ jobs:
git config --global user.name $(git log --pretty=format:"%an" -n1) git config --global user.name $(git log --pretty=format:"%an" -n1)
git add . git add .
if git diff --cached --exit-code --quiet; then if git diff --cached --exit-code --quiet; then
echo "MADE_CHANGES=false" >> "$GITHUB_OUTPUT"
echo "Nothing to commit." echo "Nothing to commit."
else else
git commit -m "fix: pull new editor translations from Transifex" git commit -m "fix: pull new editor translations from Transifex"
echo "MADE_CHANGES=true" >> "$GITHUB_OUTPUT"
git push git push
fi fi
call-ci-cd:
needs: daily-tx-pull
if: needs.daily-tx-pull.outputs.MADE_CHANGES == 'true'
uses: ./.github/workflows/ci-cd.yml
secrets: inherit