Loading snippets/basop/activate-debug-mode-info-if-set.sh +0 −2 Original line number Diff line number Diff line Loading @@ -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 Loading snippets/basop/build-binaries.sh +21 −13 Original line number Diff line number Diff line Loading @@ -2,13 +2,12 @@ set -euxo pipefail cd "${CI_PROJECT_DIR}" mode="${1:-}" case "$mode" in float-ref) ref_to_check_out="$FLOAT_REF_COMMIT" working_dir="$SCRIPTS_DIR" ivas_cod_filename="./$REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_dec_filename="./$REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_rend_filename="./$REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY" Loading @@ -17,6 +16,7 @@ float-ref) ;; float-ref-merge-source) ref_to_check_out="$MERGE_SOURCE_FLOAT_REF_COMMIT" working_dir="$SCRIPTS_DIR" ivas_cod_filename="./$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_dec_filename="./$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_rend_filename="./$MERGE_SOURCE_FLOAT_REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY" Loading @@ -25,6 +25,7 @@ float-ref-merge-source) ;; merge-target) ref_to_check_out="$MERGE_TARGET_COMMIT" working_dir="$CI_PROJECT_DIR" ivas_cod_filename="./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_dec_filename="./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_rend_filename="./$MERGE_TARGET_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY" Loading @@ -33,6 +34,7 @@ merge-target) ;; dut) ref_to_check_out="$CI_COMMIT_SHA" working_dir="$CI_PROJECT_DIR" 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" Loading @@ -47,14 +49,12 @@ esac echo "Building $mode binaries from branch $ref_to_check_out" current_commit_sha="$(git rev-parse HEAD)" # for float ref stuff, we need the ivas-codec repo which is persistently stored on the runners # working_dir is set as per input argument pushd "$working_dir" restore_stash() { if [[ "$(git stash list)" != "" ]]; then git stash pop fi } trap restore_stash EXIT # the git SHA and stash restoring mechanisms is not really necessary for float-ref branches, but also should not harm, so no if here current_commit_sha="$(git rev-parse HEAD)" # store potential changes # should never fail, even if there is nothing to be stored Loading @@ -68,12 +68,20 @@ make clean make -j "$(nproc)" # avoid errors in mv when renaming to same file mv IVAS_cod "$ivas_cod_filename" mv IVAS_dec "$ivas_dec_filename" mv IVAS_rend "$ivas_rend_filename" if [ -f ISAR_post_rend ]; then mv ISAR_post_rend "$isar_post_rend_filename"; fi mv IVAS_cod "${CI_PROJECT_DIR}/${ivas_cod_filename}" mv IVAS_dec "${CI_PROJECT_DIR}/${ivas_dec_filename}" mv IVAS_rend "${CI_PROJECT_DIR}/${ivas_rend_filename}" mv ISAR_post_rend "${CI_PROJECT_DIR}/${isar_post_rend_filename}" # return to current branch git restore . git rev-parse HEAD >"$commit_file" git checkout "$current_commit_sha" # this used to be a TRAP for EXIT before, but now with the popd at the end, we might not be in the corresponding git repo anymore at EXIT # instead, this is called manually here now if [[ "$(git stash list)" != "" ]]; then git stash pop fi popd Loading
snippets/basop/activate-debug-mode-info-if-set.sh +0 −2 Original line number Diff line number Diff line Loading @@ -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 Loading
snippets/basop/build-binaries.sh +21 −13 Original line number Diff line number Diff line Loading @@ -2,13 +2,12 @@ set -euxo pipefail cd "${CI_PROJECT_DIR}" mode="${1:-}" case "$mode" in float-ref) ref_to_check_out="$FLOAT_REF_COMMIT" working_dir="$SCRIPTS_DIR" ivas_cod_filename="./$REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_dec_filename="./$REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_rend_filename="./$REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY" Loading @@ -17,6 +16,7 @@ float-ref) ;; float-ref-merge-source) ref_to_check_out="$MERGE_SOURCE_FLOAT_REF_COMMIT" working_dir="$SCRIPTS_DIR" ivas_cod_filename="./$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_dec_filename="./$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_rend_filename="./$MERGE_SOURCE_FLOAT_REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY" Loading @@ -25,6 +25,7 @@ float-ref-merge-source) ;; merge-target) ref_to_check_out="$MERGE_TARGET_COMMIT" working_dir="$CI_PROJECT_DIR" ivas_cod_filename="./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_dec_filename="./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY" ivas_rend_filename="./$MERGE_TARGET_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY" Loading @@ -33,6 +34,7 @@ merge-target) ;; dut) ref_to_check_out="$CI_COMMIT_SHA" working_dir="$CI_PROJECT_DIR" 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" Loading @@ -47,14 +49,12 @@ esac echo "Building $mode binaries from branch $ref_to_check_out" current_commit_sha="$(git rev-parse HEAD)" # for float ref stuff, we need the ivas-codec repo which is persistently stored on the runners # working_dir is set as per input argument pushd "$working_dir" restore_stash() { if [[ "$(git stash list)" != "" ]]; then git stash pop fi } trap restore_stash EXIT # the git SHA and stash restoring mechanisms is not really necessary for float-ref branches, but also should not harm, so no if here current_commit_sha="$(git rev-parse HEAD)" # store potential changes # should never fail, even if there is nothing to be stored Loading @@ -68,12 +68,20 @@ make clean make -j "$(nproc)" # avoid errors in mv when renaming to same file mv IVAS_cod "$ivas_cod_filename" mv IVAS_dec "$ivas_dec_filename" mv IVAS_rend "$ivas_rend_filename" if [ -f ISAR_post_rend ]; then mv ISAR_post_rend "$isar_post_rend_filename"; fi mv IVAS_cod "${CI_PROJECT_DIR}/${ivas_cod_filename}" mv IVAS_dec "${CI_PROJECT_DIR}/${ivas_dec_filename}" mv IVAS_rend "${CI_PROJECT_DIR}/${ivas_rend_filename}" mv ISAR_post_rend "${CI_PROJECT_DIR}/${isar_post_rend_filename}" # return to current branch git restore . git rev-parse HEAD >"$commit_file" git checkout "$current_commit_sha" # this used to be a TRAP for EXIT before, but now with the popd at the end, we might not be in the corresponding git repo anymore at EXIT # instead, this is called manually here now if [[ "$(git stash list)" != "" ]]; then git stash pop fi popd