diff --git a/.github/workflows/i18n-crowdin-download.yml b/.github/workflows/i18n-crowdin-download.yml index 0e9f8c4514d..13a8873fef6 100644 --- a/.github/workflows/i18n-crowdin-download.yml +++ b/.github/workflows/i18n-crowdin-download.yml @@ -150,7 +150,7 @@ jobs: # - 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 run: | - filesChanged="$(gh pr diff --name-only "$PR_URL")" + filesChanged="$(gh pr diff --name-only ${{ steps.crowdin-download.outputs.pull_request_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 echo "Non-i18n changes detected, not approving" @@ -163,8 +163,7 @@ jobs: fi echo "Approving and enabling automerge" - gh pr review "$PR_URL" --approve - gh pr merge --auto --squash "$PR_URL" + gh pr review ${{ steps.crowdin-download.outputs.pull_request_url }} --approve + gh pr merge --auto --squash ${{ steps.crowdin-download.outputs.pull_request_url }} env: GITHUB_TOKEN: ${{ steps.generate_approver_token.outputs.token }} - PR_URL: ${{ steps.crowdin-download.outputs.pull_request_url }}