Loading .gitlab-ci.yml +2 −2 Original line number Diff line number Diff line Loading @@ -212,7 +212,7 @@ branch-is-up-to-date-with-main-pre: - | commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)" echo "Commits behind: $commits_behind_count" if [ "$commits_behind_count" -nq 0 ]; then if [ "$commits_behind_count" -ne 0 ]; then echo "Your branch is behind main, run 'git merge origin/main' to update." exit 1 fi Loading Loading @@ -244,7 +244,7 @@ branch-is-up-to-date-with-main-post: - | commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)" echo "Commits behind: $commits_behind_count" if [ "$commits_behind_count" -nq 0 ]; then if [ "$commits_behind_count" -ne 0 ]; then echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update." exit 1 fi Loading Loading
.gitlab-ci.yml +2 −2 Original line number Diff line number Diff line Loading @@ -212,7 +212,7 @@ branch-is-up-to-date-with-main-pre: - | commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)" echo "Commits behind: $commits_behind_count" if [ "$commits_behind_count" -nq 0 ]; then if [ "$commits_behind_count" -ne 0 ]; then echo "Your branch is behind main, run 'git merge origin/main' to update." exit 1 fi Loading Loading @@ -244,7 +244,7 @@ branch-is-up-to-date-with-main-post: - | commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)" echo "Commits behind: $commits_behind_count" if [ "$commits_behind_count" -nq 0 ]; then if [ "$commits_behind_count" -ne 0 ]; then echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update." exit 1 fi Loading