From: Philippe Antoine <contact@catenacyber.fr>
Date: Mon, 5 Jul 2021 14:37:03 +0000 (+0200)
Subject: ci: rebase specified s-v pr
X-Git-Tag: suricata-6.0.4~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e374ca1276d4ef350de3d08123b7e4b6ef9ffd;p=thirdparty%2Fsuricata.git

ci: rebase specified s-v pr

So that CI does not fail, if suricata PR got upgraded in a new
version, but S-V PR did not get upgraded, and S-V changed
in master

(cherry picked from commit 3e81d20a71deb2a061d3f86430b88b8bdd4b7d6d)
---

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index cbb0836b00..6b3fb44c2c 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -94,11 +94,12 @@ jobs:
           tar zcf suricata-update.tar.gz suricata-update
       - name: Fetching suricata-verify
         run: |
-          git clone --depth 1 ${sv_repo} -b ${sv_branch} suricata-verify
+          git clone ${sv_repo} -b ${sv_branch} suricata-verify
           if [[ "${sv_pr}" != "" ]]; then
               cd suricata-verify
               git fetch origin pull/${sv_pr}/head:prep
               git checkout prep
+              git rebase ${DEFAULT_SV_BRANCH}
               cd ..
           fi
           tar zcf suricata-verify.tar.gz suricata-verify