Commit 72e66d48 authored by Fabian Müller's avatar Fabian Müller
Browse files

Improve branch-is-up-to-date scripts

parent 71763425

.gitlab-ci.yml

+14 −6
Original line number Diff line number Diff line
@@ -349,9 +349,13 @@ branch-is-up-to-date-with-main-pre: 
  tags:

    - ivas-linux

  script:

    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi;

    - commits_behind_count="$(bash "${CI_PROJECT_DIR}"/snippets/get-commits-behind-count.sh)"

    - |

      commits_behind_count="$(bash "${CI_PROJECT_DIR}"/snippets/get-commits-behind-count.sh)"

      echo "Commits behind: $commits_behind_count"

      if [ "$commits_behind_count" -nq 0 ]; then

        echo "Your branch is behind main, run 'git merge origin/main' to update."

        exit 1

      fi



check-self-test-names-pre:

  extends:
@@ -380,9 +384,13 @@ branch-is-up-to-date-with-main-post: 
  tags:

    - ivas-linux

  script:

    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update." exit 1; fi;

    - commits_behind_count="$(bash "${CI_PROJECT_DIR}"/snippets/get-commits-behind-count.sh)"

    - |

      commits_behind_count="$(bash "${CI_PROJECT_DIR}"/snippets/get-commits-behind-count.sh)"

      echo "Commits behind: $commits_behind_count"

      if [ "$commits_behind_count" -nq 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



.basop-ci-branch-compat-template:

  extends: