Cherry-pick fd9b7d6 with conflicts

vitessio · Sep 28, 2023 · a48fb28 · a48fb28
1 parent 720e035
commit a48fb28
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml
@@ -24,12 +24,15 @@ jobs:
         if: steps.skip-workflow.outputs.skip-workflow == 'false'
         uses: actions/checkout@v3
 
+<<<<<<< HEAD
       - name: Run FOSSA scan and upload build data
         if: steps.skip-workflow.outputs.skip-workflow == 'false'
         uses: fossa-contrib/fossa-action@v1
         with:
           fossa-api-key: 76d7483ea206d530d9452e44bffe7ba8
 
+=======
+>>>>>>> fd9b7d623d (Remove FOSSA Test from CI until we can do it in a secure way (#14119))
       - name: Check for changes in Go files
         if: steps.skip-workflow.outputs.skip-workflow == 'false'
         uses: frouioui/paths-filter@main