Merge pull request #41 from google/force-checkout

fix: Use force checkout on second checkout for PR scanning
google · Sep 10, 2024 · 6777cfa · 6777cfa
2 parents 75f230e + 5624e70
commit 6777cfa
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/osv-scanner-reusable-pr.yml b/.github/workflows/osv-scanner-reusable-pr.yml
@@ -64,7 +64,8 @@ jobs:
             --output=old-results.json
             ${{ inputs.scan-args }}
       - name: "Checkout current branch"
-        run: git checkout $GITHUB_SHA
+        # Use -f in case any changes were made by osv-scanner (there should be no changes)
+        run: git checkout -f $GITHUB_SHA
       - name: "Run scanner on new code"
         uses: google/osv-scanner-action/osv-scanner-action@fa6b69996424da9c1cebadc9bf67a02010433218 # v1.8.4
         with: