Commit f0c3102b authored by Jan Kiene's avatar Jan Kiene
Browse files

some cleanup and comment adjustment

parent 60c0464d
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -2,4 +2,3 @@ variables:
  FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
  MERGE_SOURCE_FLOAT_REF_COMMIT_FILE: "merge-source-float-ref-git-sha.txt"
  MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
  FLOAT_REF_COMMIT: "ivas-float-update"
+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ clang-format-check:


# This job runs in manual jobs and scheduled jobs that compares to the float reference.
# It fetches the latest commit of ivas-float-update and stores in FLOAT_COMMIT_REF
# It fetches the latest commit of ivas-codec main and stores in FLOAT_COMMIT_REF
pytest-to-ref-pre:
  extends:
    - .job-linux
+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ exit_code_follows_naming_conventions=0
# if branch does not follow the convention, there will be a printout which is irrelevant here, so redirect it to null
bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/branch-follows-porting-naming-convention.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME >>/dev/null || exit_code_follows_naming_conventions=$?
# if this branch follows the naming convetions, we can try to get the corresponding float MR branch
# if this branch does NOT follow the porting naming convention, the float ref is just ivas-float-update, so skip everything
# if this branch does NOT follow the porting naming convention, the float ref is just ivas-codec main, so skip everything
if [[ "$exit_code_follows_naming_conventions" == "0" ]]; then
  float_ref_branchname_in_ivas_codec=$(${CI_PROJECT_DIR}/ivas-codec-ci/snippets/basop/get-float-ref-branch-name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)
fi
+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@
# the United Nations Convention on Contracts on the International Sales of Goods.

MSG_NO_FLOAT_REF_BRANCH_FOUND="Your branch name %s looks like it is a porting MR, but there is no corresponding float merge request (%s).
If this is intended (nothing to port to ivas-float-update), simply ignore this warning.
If this is intended (no changes on ivas-codec main), simply ignore this warning.
If there should be a float ref branch for this MR, please check your spelling on your other branch and make sure that you pushed it.\n
"