From a48fb28302e77fb5e29510fdfe85cab3af9e2a37 Mon Sep 17 00:00:00 2001
From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 21:23:13 +0200
Subject: [PATCH] Cherry-pick fd9b7d623d4f1311090a4213fd20096de88daf7c with
 conflicts

---
 .github/workflows/static_checks_etc.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml
index 7737e178111..a9355ebc635 100644
--- 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