Skip to content

Commit

Permalink
Merge pull request #186 from scratchfoundation/fix-release-after-tx-pull
Browse files Browse the repository at this point in the history
More GitHub Actions maintenance
  • Loading branch information
cwillisf authored Nov 20, 2023
2 parents 1005ced + 62f23e8 commit eb429e8
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ jobs:
TRIGGER_DEPLOY: ${{ startsWith(github.ref, 'refs/heads/master') }}
steps:
- uses: actions/checkout@v4
- uses: wagoid/commitlint-github-action@v5
if: github.event_name == 'pull_request'

- uses: actions/setup-node@v3
with:
cache: "npm"
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Lint commit messages
on: [pull_request]

concurrency:
group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
cancel-in-progress: true

jobs:
commitlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: wagoid/commitlint-github-action@v5
7 changes: 4 additions & 3 deletions .github/workflows/daily-tx-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,19 @@ jobs:
npm run test
- name: Commit translation updates
id: commit
run: |
git config --global user.email $(git log --pretty=format:"%ae" -n1)
git config --global user.name $(git log --pretty=format:"%an" -n1)
git add .
if git diff --cached --exit-code --quiet; then
echo "MADE_CHANGES=false" >> "$GITHUB_OUTPUT"
echo "Nothing to commit."
echo "::set-env name=MADE_CHANGES::false"
else
git commit -m "pull new editor translations from Transifex"
echo "MADE_CHANGES=true" >> "$GITHUB_OUTPUT"
git push origin HEAD:master
echo "::set-env name=MADE_CHANGES::true"
fi
- name: Start CI/CD workflow if changes were made
if: env.MADE_CHANGES == 'true'
if: steps.commit.outputs.MADE_CHANGES == 'true'
uses: ./.github/workflows/ci-cd.yml

0 comments on commit eb429e8

Please sign in to comment.