diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-06 13:24:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-06 13:24:11 -0400 |
| commit | 1f54007161cc8d315e7733d5d8cb2699d9f849fd (patch) | |
| tree | 9263490797e8aa020f120a75302a06a82d2f4416 | |
| parent | 529b98967538b0a942ded2e4739591c9fe01d8e1 (diff) | |
| parent | 352991c843e2c0404fd44178cbf3df32cc365bc1 (diff) | |
| download | tor-1f54007161cc8d315e7733d5d8cb2699d9f849fd.tar.gz tor-1f54007161cc8d315e7733d5d8cb2699d9f849fd.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -rw-r--r-- | .gitlab-ci.yml | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2d0d55dd4..e8d6c5f418 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +image: debian:stable + before_script: - apt-get update -qq - apt-get upgrade -qy @@ -13,33 +15,3 @@ build: - make check || (e=$?; cat test-suite.log; exit $e) - make install -update: - only: - - schedules - script: - - "apt-get install -y --fix-missing git openssh-client" - - # Run ssh-agent (inside the build environment) - - eval $(ssh-agent -s) - - # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - - ssh-add <(echo "$DEPLOY_KEY") - - # For Docker builds disable host key checking. Be aware that by adding that - # you are susceptible to man-in-the-middle attacks. - # WARNING: Use this only with the Docker executor, if you use it with shell - # you will overwrite your user's SSH config. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - # In order to properly check the server's host key, assuming you created the - # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines - # instead. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - - echo "merging from torgit" - - git config --global user.email "labadmin@oniongit.eu" - - git config --global user.name "gitadmin" - - "mkdir tor" - - "cd tor" - - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:network/tor.git |