diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-10 14:07:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-10 14:07:34 -0400 |
| commit | d9321d697d8ac01284a07ac9651bbfa4030f96e6 (patch) | |
| tree | a01d02e8bde9d8f449592de62f4d4cbc6eb99baf | |
| parent | 51e47481fc6f131d4e421de061029459ccbb033e (diff) | |
| parent | d5d811e2d08beca0b6029cfab50201966335f976 (diff) | |
| download | tor-d9321d697d8ac01284a07ac9651bbfa4030f96e6.tar.gz tor-d9321d697d8ac01284a07ac9651bbfa4030f96e6.zip | |
Merge remote-tracking branch 'catalyst-oniongit/bug23755'
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | changes/bug23755 | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78a1b0e7ef..969646b987 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,8 @@ build: - "make install" update: + only: + - schedules script: - "apt-get install -y --fix-missing git openssh-client" @@ -36,4 +38,4 @@ update: - "mkdir tor" - "cd tor" - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:network/tor.git
\ No newline at end of file + - git push --mirror git@oniongit.eu:network/tor.git diff --git a/changes/bug23755 b/changes/bug23755 new file mode 100644 index 0000000000..98f0970344 --- /dev/null +++ b/changes/bug23755 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Stop unconditionally mirroring the tor repository in GitLab CI. + This prevented developers from enabling GitLab CI on master. + Fixes bug 23755; bugfix on 0.3.2.2-alpha. |