Loading main-basop.yml +1 −0 Original line number Diff line number Diff line Loading @@ -851,6 +851,7 @@ branch-is-up-to-date-with-target-pre: tags: - ivas-basop-linux script: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/branch-is-up-to-date-with-target-pre.sh artifacts: paths: Loading snippets/basop/branch-is-up-to-date-with-target-pre.sh +4 −7 Original line number Diff line number Diff line Loading @@ -31,7 +31,6 @@ set -euxo pipefail URL_FLOAT_REPO="https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec.git" FLOAT_DIR="ivas-codec" float_ref_branchname_in_ivas_codec="main" exit_code_follows_naming_conventions=0 Loading Loading @@ -62,14 +61,12 @@ echo "$MERGE_TARGET_COMMIT" >"$MERGE_TARGET_COMMIT_FILE" set -x # to get the commit SHAs for the float reference branches, we need to clone the repo here git clone $URL_FLOAT_REPO $FLOAT_DIR --depth 1 # to get the commit SHAs for the float reference branches, we need to get the main branch from float repo # below here we will be in the float repo! cd $FLOAT_DIR # only fetch ref branch, main is the default branch cd "${SCRIPTS_DIR}" git remote set-branches --add origin "$float_ref_branchname_in_ivas_codec" git fetch origin "$float_ref_branchname_in_ivas_codec" git checkout "$float_ref_branchname_in_ivas_codec" # stop echoing from here on, this is anyway only dbg printout set +x Loading snippets/basop/update-scripts-repo.sh +5 −3 Original line number Diff line number Diff line Loading @@ -9,8 +9,10 @@ pushd "${SCRIPTS_DIR}" # Remove all fetch lines to clean out dead links sed -i '/fetch/d' .git/config # Add currently used branch git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" # Add currently used branches: # - BASOP_CI_BRANCH_PC_REPO for scripts/tests # - main for getting the float ref codec git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" main git fetch Loading Loading
main-basop.yml +1 −0 Original line number Diff line number Diff line Loading @@ -851,6 +851,7 @@ branch-is-up-to-date-with-target-pre: tags: - ivas-basop-linux script: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/branch-is-up-to-date-with-target-pre.sh artifacts: paths: Loading
snippets/basop/branch-is-up-to-date-with-target-pre.sh +4 −7 Original line number Diff line number Diff line Loading @@ -31,7 +31,6 @@ set -euxo pipefail URL_FLOAT_REPO="https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec.git" FLOAT_DIR="ivas-codec" float_ref_branchname_in_ivas_codec="main" exit_code_follows_naming_conventions=0 Loading Loading @@ -62,14 +61,12 @@ echo "$MERGE_TARGET_COMMIT" >"$MERGE_TARGET_COMMIT_FILE" set -x # to get the commit SHAs for the float reference branches, we need to clone the repo here git clone $URL_FLOAT_REPO $FLOAT_DIR --depth 1 # to get the commit SHAs for the float reference branches, we need to get the main branch from float repo # below here we will be in the float repo! cd $FLOAT_DIR # only fetch ref branch, main is the default branch cd "${SCRIPTS_DIR}" git remote set-branches --add origin "$float_ref_branchname_in_ivas_codec" git fetch origin "$float_ref_branchname_in_ivas_codec" git checkout "$float_ref_branchname_in_ivas_codec" # stop echoing from here on, this is anyway only dbg printout set +x Loading
snippets/basop/update-scripts-repo.sh +5 −3 Original line number Diff line number Diff line Loading @@ -9,8 +9,10 @@ pushd "${SCRIPTS_DIR}" # Remove all fetch lines to clean out dead links sed -i '/fetch/d' .git/config # Add currently used branch git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" # Add currently used branches: # - BASOP_CI_BRANCH_PC_REPO for scripts/tests # - main for getting the float ref codec git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" main git fetch Loading