ci/check_changelog: reduce race condition (#7734)

PR #7732 illustrated a bug in our current changelog check: it only worked if the PR was up-to-date with `master` at the time of pushing. This was not the intention. Fortunately, the fix is fairly easy: check out the PR commit before running the check, rather than run it from the merge commit (as Azure does by default). CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Oct 19, 2020 · 5945040 · 5945040
1 parent 8e4e0f9
commit 5945040
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -74,13 +74,17 @@ jobs:
       - git_sha
     variables:
       fork_sha: $[ dependencies.git_sha.outputs['out.fork_point'] ]
+      pr_commit: $[ dependencies.git_sha.outputs['out.branch'] ]
     condition: eq(variables['Build.Reason'], 'PullRequest')
     pool:
       name: 'linux-pool'
       demands: assignment -equals default
     steps:
       - checkout: self
-      - bash: ci/check-changelog.sh $(fork_sha)
+      - bash: |
+          set -euo pipefail
+          git checkout $(pr_commit)
+          ci/check-changelog.sh $(fork_sha)
 
   - template: ci/da-ghc-lib/compile.yml
     parameters: