Commit 305ae6f3 authored by Jan Kiene's avatar Jan Kiene
Browse files

bring configurable branch for ci scripts back

parent 20bc2036

includes/default-variables.yml

+2 −0
Original line number Diff line number Diff line
@@ -11,5 +11,7 @@ variables: 
  TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400

  SCALE_FACTOR: "3.162"

  PYTEST_ADDOPTS: ""

  # this contains the name of the branch in ivas-codec repo that is used to copy the ci scripts from

  BASOP_CI_SCRIPTS_BRANCH: "main"

  # overwrite this via .gitlab/variables.yml in the respective other repo to disable "(model from file)" testcases

  DISABLE_HRTF: "false"

snippets/basop/update-scripts-repo.sh

+4 −2
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ pushd "${SCRIPTS_DIR}" 
# Remove all fetch lines to clean out dead links

sed -i '/fetch/d' .git/config



git remote set-branches --add origin main

# we need main for getting the float reference code

# BASOP_CI_SCRIPTS_BRANCH is per default main as well, but can be overwritten to test things before merging

git remote set-branches --add origin main $BASOP_CI_SCRIPTS_BRANCH



git fetch
@@ -17,7 +19,7 @@ git fetch 
git restore --staged .

git restore .



git checkout main

git checkout $BASOP_CI_SCRIPTS_BRANCH

git pull



popd