Commit 6cd491c9 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into kiene/consolidate-basop-ci-code

parents 6541d800 d41c8ab2

includes/default-variables.yml

+4 −1
Original line number Diff line number Diff line
@@ -10,5 +10,8 @@ variables: 
  TESTCASE_TIMEOUT_STV_SANITIZERS: 240

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400

  SCALE_FACTOR: "3.162"

  BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"

  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-ci.yml in the respective other repo to disable "(model from file)" testcases

  DISABLE_HRTF: "false"

snippets/basop/update-scripts-repo.sh

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

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



# Add currently used branches:

#   - BASOP_CI_BRANCH_PC_REPO for scripts/tests

#   - main for getting the float ref codec

git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" 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
@@ -20,7 +19,7 @@ git fetch 
git restore --staged .

git restore .



git checkout "$BASOP_CI_BRANCH_PC_REPO"

git checkout $BASOP_CI_SCRIPTS_BRANCH

git pull



popd