Loading snippets/basop/branch-is-up-to-date-with-target-pre.sh +0 −3 Original line number Diff line number Diff line Loading @@ -30,8 +30,6 @@ set -euxo pipefail URL_FLOAT_REPO="https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec.git" float_ref_branchname_in_ivas_codec="main" 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 Loading Loading @@ -59,7 +57,6 @@ MERGE_TARGET_COMMIT="$(git rev-parse "origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAM pushd "${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" MERGE_SOURCE_FLOAT_REF_COMMIT="$(git rev-parse "origin/$float_ref_branchname_in_ivas_codec")" FLOAT_REF_COMMIT="$(git rev-parse "origin/main")" Loading snippets/basop/get-float-ref-branch-name.sh +2 −2 Original line number Diff line number Diff line Loading @@ -48,14 +48,14 @@ branchname_out="main" # If the format is correct, then before "_basop", only numbers can occur float_ref_branchname="${branchname_in/basop/ref}" # now check in ivas-codec repository if a branch with this name exits # now check in ivas-codec repository if a branch with this name exists exit_code_ls_remote=0 pushd "${SCRIPTS_DIR}" git fetch origin git ls-remote --exit-code --heads origin refs/heads/$float_ref_branchname || exit_code_ls_remote=$? popd # If the branch does not exist, default to "ivas-float-update" # If the branch exists, we use it as ref name instead of main # NOTE: "git ls-remote --exit-code" returns 2 if the given ref was not found if [ "$exit_code_ls_remote" -eq "0" ]; then branchname_out="${float_ref_branchname}" Loading Loading
snippets/basop/branch-is-up-to-date-with-target-pre.sh +0 −3 Original line number Diff line number Diff line Loading @@ -30,8 +30,6 @@ set -euxo pipefail URL_FLOAT_REPO="https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec.git" float_ref_branchname_in_ivas_codec="main" 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 Loading Loading @@ -59,7 +57,6 @@ MERGE_TARGET_COMMIT="$(git rev-parse "origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAM pushd "${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" MERGE_SOURCE_FLOAT_REF_COMMIT="$(git rev-parse "origin/$float_ref_branchname_in_ivas_codec")" FLOAT_REF_COMMIT="$(git rev-parse "origin/main")" Loading
snippets/basop/get-float-ref-branch-name.sh +2 −2 Original line number Diff line number Diff line Loading @@ -48,14 +48,14 @@ branchname_out="main" # If the format is correct, then before "_basop", only numbers can occur float_ref_branchname="${branchname_in/basop/ref}" # now check in ivas-codec repository if a branch with this name exits # now check in ivas-codec repository if a branch with this name exists exit_code_ls_remote=0 pushd "${SCRIPTS_DIR}" git fetch origin git ls-remote --exit-code --heads origin refs/heads/$float_ref_branchname || exit_code_ls_remote=$? popd # If the branch does not exist, default to "ivas-float-update" # If the branch exists, we use it as ref name instead of main # NOTE: "git ls-remote --exit-code" returns 2 if the given ref was not found if [ "$exit_code_ls_remote" -eq "0" ]; then branchname_out="${float_ref_branchname}" Loading