Merge pull request #32265 from OlimpiaZurek/fix/31145-performance-tes…

…ts-workflow [NoQA] change performance tests workflow
Expensify · Dec 12, 2023 · 2f337d5 · 2f337d5
2 parents 897dead + d4a688b
commit 2f337d5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/reassurePerformanceTests.yml b/.github/workflows/reassurePerformanceTests.yml
@@ -17,6 +17,11 @@ jobs:
       - name: Setup NodeJS
         uses: ./.github/actions/composite/setupNode
 
+      - name: Set dummy git credentials
+        run: |
+            git config --global user.email "[email protected]"
+            git config --global user.name "Test"
+
       - name: Run performance testing script
         shell: bash
         run: |
@@ -27,6 +32,7 @@ jobs:
           npm install --force
           npx reassure --baseline
           git switch --force --detach -
+          git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
           npm install --force
           npx reassure --branch