Skip to content

Commit

Permalink
ci: rebase specified s-v pr
Browse files Browse the repository at this point in the history
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 3e81d20)
  • Loading branch information
catenacyber authored and victorjulien committed Sep 6, 2021
1 parent 80659ce commit 11e374c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 11e374c

Please sign in to comment.