Unverified Commit 9bca193e authored by anarcat's avatar anarcat
Browse files

reorder 

The comments were misrefering to things
parent b5ef86fa

.gitlab-ci.yml

+17 −17
Original line number Diff line number Diff line
@@ -32,23 +32,6 @@ find-files-commit: 
      - changed-files.txt

    expose_as: 'changed files'



# this compares the current repo with the actual wiki to make sure

# we're not missing any commits, and will fail the push if we need to

# pull from the wiki

#

# it doesn't run on merge requests to leave those poor people alone

fail-on-desync-wiki:

  stage: build

  image: debian:stable-slim

  script:

    - 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

      - branches



# this is the same as the above, but for merge requests

find-files-mr:

  stage: build
@@ -68,6 +51,23 @@ find-files-mr: 
      - changed-files.txt

    expose_as: 'changed files'



# this compares the current repo with the actual wiki to make sure

# we're not missing any commits, and will fail the push if we need to

# pull from the wiki

#

# it doesn't run on merge requests to leave those poor people alone

fail-on-desync-wiki:

  stage: build

  image: debian:stable-slim

  script:

    - 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

      - branches



# this runs after the "build" stage above, and consumes the

# `changed-files.txt` artifact from that stage, regardless of the job

# which generated it.