Commit 962cc6a2 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into kiene/warning-for-basop-porting-naming-check

parents dd4e95cf d4c415e7

includes/basop-default-variables.yml

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 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"

includes/default-variables.yml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ variables: 
  TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400

  BASOP_REFERENCE_BRANCH: "ivas-float-update"

  SCALE_FACTOR: "3.162"

  BASOP_CI_BRANCH_PC_REPO: "ci/add-inplace-option-to-create-short-testvectory-script"

  BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"

  PYTEST_ADDOPTS: ""

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

  DISABLE_HRTF: "false"

main-basop.yml

+91 −50

File changed.

Preview size limit exceeded, changes collapsed.

snippets/basop/branch-is-up-to-date-with-target-pre.sh

+11 −2
Original line number Diff line number Diff line
@@ -28,10 +28,19 @@ 
# 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.



float_ref_branchname="ivas-float-update"

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 $branchname_in >>/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 [[ "exit_code_follows_naming_conventions" == "0" ]]; then

  float_ref_branchname=$(${CI_PROJECT_DIR}/ivas-codec-ci/snippets/basop/get-float-ref-branch-name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)

fi



# fetch all needed branches

git fetch origin "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"

git fetch origin ivas-float-update

float_ref_branchname=$(${CI_PROJECT_DIR}/ivas-codec-ci/snippets/basop/get-float-ref-branch-name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME)

git fetch origin "$float_ref_branchname"



# then check if we are behind the merge target
@@ -47,7 +56,7 @@ echo "MERGE_TARGET_COMMIT is $MERGE_TARGET_COMMIT" 
echo "$MERGE_TARGET_COMMIT" >"$MERGE_TARGET_COMMIT_FILE"



MERGE_SOURCE_FLOAT_REF_COMMIT="$(git rev-parse "origin/$float_ref_branchname")"

echo "MERGE_SOURCEFLOAT_REF_COMMIT is $MERGE_SOURCE_FLOAT_REF_COMMIT"

echo "MERGE_SOURCE_FLOAT_REF_COMMIT is $MERGE_SOURCE_FLOAT_REF_COMMIT"

echo "$MERGE_SOURCE_FLOAT_REF_COMMIT" >"$MERGE_SOURCE_FLOAT_REF_COMMIT_FILE"



FLOAT_REF_COMMIT="$(git rev-parse "origin/ivas-float-update")"

snippets/basop/merge-request-print-pinned-commits.sh

0 → 100644
+38 −0
Original line number Diff line number Diff line 
#!/bin/bash



# (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

# contributors to this repository. All Rights Reserved.

#

# This software is protected by copyright law and by international treaties.

# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,

# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

# contributors to this repository retain full ownership rights in their respective contributions in

# the software. This notice grants no license of any kind, including but not limited to patent

# license, nor is any license granted by implication, estoppel or otherwise.

#

# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making

# contributions.

#

# This software is provided "AS IS", without any express or implied warranties. The software is in the

# development stage. It is intended exclusively for experts who have experience with such software and

# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability

# and fitness for a particular purpose are hereby disclaimed and excluded.

#

# Any dispute, controversy or claim arising under or in relation to providing this software shall be

# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in

# 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.



echo "====== Pinned commits in files: ======"

cat $MERGE_TARGET_COMMIT_FILE

cat $FLOAT_REF_COMMIT_FILE

cat $MERGE_SOURCE_FLOAT_REF_COMMIT_FILE

echo "====== Pinned commits in env vars: ======"

echo "MERGE_TARGET_COMMIT=$MERGE_TARGET_COMMIT"

echo "MERGE_SOURCE_FLOAT_REF_COMMIT=$MERGE_SOURCE_FLOAT_REF_COMMIT"

echo "FLOAT_REF_COMMIT=$FLOAT_REF_COMMIT"