Commit 5057e57d authored by Jan Kiene's avatar Jan Kiene
Browse files

fixes for float ref setting and build scripts

parent d5c615c8

snippets/basop/build-binaries.sh

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ merge-target) 
  commit_file="$MERGE_TARGET_COMMIT_FILE"

  ;;

merge-source)

  branch_to_check_out=""

  branch_to_check_out="$FLOAT_REF_BRANCH_MERGE_SOURCE"

  ivas_cod_filename="./$DUT_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  ivas_dec_filename="./$DUT_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

  ivas_rend_filename="./$DUT_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY"

snippets/basop/set-float-reference-branches.sh

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ cd "${CI_PROJECT_DIR}" 
FLOAT_REF_BRANCH_MERGE_SOURCE=$FLOAT_REF_BRANCH



# for porting MRs use the name-check script

if [ $CI_MERGE_REQUEST_TARGET_BRANCH_NAME = "main" -a "${CI_MERGE_REQUEST_TITLE,,}" =~ \[PORTING\] ]; then

if [[ $CI_MERGE_REQUEST_TARGET_BRANCH_NAME = "main" ]] && [[ "${CI_MERGE_REQUEST_TITLE,,}" =~ \[porting\] ]]; then

  if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then

    bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh

    # a bit awkward: write to file + standard out first so that the error message is visible in case of failure. Then fill the variable from the file
@@ -19,3 +19,5 @@ fi 


# TODO: remove after merge to main

FLOAT_REF_BRANCH_MERGE_SOURCE=float-pc



export FLOAT_REF_BRANCH_MERGE_SOURCE