Loading .gitlab-ci.yml +2 −3 Original line number Diff line number Diff line Loading @@ -60,9 +60,8 @@ fail-on-desync-wiki: - apt update && apt install -yy --no-install-recommends git ca-certificates - git fetch wiki || git remote add -f wiki https://gitlab.torproject.org/tpo/tpa/team.wiki.git - git merge --ff-only wiki/master except: refs: - merge_requests rules: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # this runs after the "build" stage above, and consumes the # `changed-files.txt` artifact from that stage, regardless of the job Loading Loading
.gitlab-ci.yml +2 −3 Original line number Diff line number Diff line Loading @@ -60,9 +60,8 @@ fail-on-desync-wiki: - apt update && apt install -yy --no-install-recommends git ca-certificates - git fetch wiki || git remote add -f wiki https://gitlab.torproject.org/tpo/tpa/team.wiki.git - git merge --ff-only wiki/master except: refs: - merge_requests rules: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # this runs after the "build" stage above, and consumes the # `changed-files.txt` artifact from that stage, regardless of the job Loading