Commit 799957a1 authored by Jan Kiene's avatar Jan Kiene
Browse files

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

parents 46319d76 c2861439
Loading
Loading
Loading
Loading

.gitlab-ci-custom.yml

0 → 100644
+4 −0
Original line number Diff line number Diff line
include:
  - project: $CUSTOM_CI_PROJECT
    ref: $CUSTOM_CI_REF
    file: $CUSTOM_CI_FILE
+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ variables:
  GIT_CLEAN_FLAGS: -ffdxq
  TESTCASE_TIMEOUT_STV_SANITIZERS: 240
  TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400
  BASOP_REFERENCE_BRANCH: "ivas-float-update"
  SCALE_FACTOR: "3.162"
  BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
  PYTEST_ADDOPTS: ""
+130 −60

File changed.

Preview size limit exceeded, changes collapsed.

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@

set -euxo pipefail

cd "${CI_PROJECT_DIR}"

if [ "$BUILD_WITH_DEBUG_MODE_INFO" = "true" ]; then
  sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUGGING\ *\)\*\//\1/g" lib_com/options.h
  sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUG_MODE_INFO\ *\)\*\//\1/g" lib_com/options.h
+5 −1
Original line number Diff line number Diff line
@@ -28,10 +28,12 @@
# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
# the United Nations Convention on Contracts on the International Sales of Goods.

set -euo pipefail

BASOP_PATTERN="^[0-9]+[_-]basop[_-].*"
MSG_DOES_NOT_MATCH="Your branch name %s does not match the template '<issue_number>_basop_<description>', e.g. '123_basop_fix_this_one_bug-2'.
If this branch is porting a float MR with a corresponding float part, then
ticking to this branch is needed for the testing system to match this branch with its float-reference counterpart.
sticking to this naming convention is needed for the testing system to match this branch with its float-reference counterpart.
Please rename your branch. You can easily do this by creating a new branch from this branch:
  - git checkout -b <new branch name here>
You then also need to create a new merge request and update the links in your issue.
@@ -49,3 +51,5 @@ if ! [[ "$1" =~ $BASOP_PATTERN ]]; then
  printf "$MSG_DOES_NOT_MATCH" "$1"
  exit 1
fi

exit 0
Loading