try again...

This commit is contained in:
Ashley Harrison
2025-05-16 09:46:32 +01:00
parent 61876e7a84
commit faeeb85aa3
+3 -3
View File
@@ -150,7 +150,7 @@ jobs:
# - the PR does not modify the en-US locale # - the PR does not modify the en-US locale
# TODO make these paths inputs to the workflow when we move this to a shared repo # TODO make these paths inputs to the workflow when we move this to a shared repo
run: | run: |
filesChanged="$(gh pr diff --name-only $PR_URL)" filesChanged="$(gh pr diff --name-only "${PR_URL}")"
if [[ $(echo "$filesChanged" | grep -cv -e 'public/locales/[a-zA-Z\-]*/grafana.json' -e 'public/app/plugins/datasource/azuremonitor/locales/[a-zA-Z\-]*/grafana-azure-monitor-datasource.json') -ne 0 ]]; then if [[ $(echo "$filesChanged" | grep -cv -e 'public/locales/[a-zA-Z\-]*/grafana.json' -e 'public/app/plugins/datasource/azuremonitor/locales/[a-zA-Z\-]*/grafana-azure-monitor-datasource.json') -ne 0 ]]; then
echo "Non-i18n changes detected, not approving" echo "Non-i18n changes detected, not approving"
@@ -163,8 +163,8 @@ jobs:
fi fi
echo "Approving and enabling automerge" echo "Approving and enabling automerge"
gh pr review "$PR_URL" --approve gh pr review "${PR_URL}" --approve
gh pr merge --auto --squash "$PR_URL" gh pr merge --auto --squash "${PR_URL}"
env: env:
GITHUB_TOKEN: ${{ steps.generate_approver_token.outputs.token }} GITHUB_TOKEN: ${{ steps.generate_approver_token.outputs.token }}
PR_URL: ${{ steps.crowdin-download.outputs.pull_request_url }} PR_URL: ${{ steps.crowdin-download.outputs.pull_request_url }}