Optimize hogql-parser-diff step

PostHog · Oct 30, 2024 · 0705285 · 0705285
1 parent f2e005c
commit 0705285
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/actions/run-backend-tests/action.yml b/.github/actions/run-backend-tests/action.yml
@@ -63,7 +63,9 @@ runs:
           id: hogql-parser-diff
           run: |
               git fetch --no-tags --prune --depth=1 origin master
+              git merge origin/master -m "Merge with master" # Create a temporary merge commit for sensible diffing
               changed=$(git diff --quiet HEAD origin/master -- hogql_parser/ && echo "false" || echo "true")
+              git reset --hard HEAD~1
               echo "changed=$changed" >> $GITHUB_OUTPUT
 
         - name: Install SAML (python3-saml) dependencies