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

Fix pre/post branch update

parent 7bd8eab0

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ branch-is-up-to-date-with-main-pre: 
  needs: []

  script:

    - |

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

      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

        echo "Your branch is behind main, run 'git merge origin/main' to update."
@@ -242,7 +242,7 @@ branch-is-up-to-date-with-main-post: 
  stage: postvalidate

  script:

    - |

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

      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

        echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update."