August 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 39d5e7c76464f4e6dae9762210363de3da7230df Merge: e78a7450a2 352991c843 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 39d5e7c76464f4e6dae9762210363de3da7230df Merge: e78a7450a2 352991c843 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit c1b440f7606303225b20e7a7a893afe6ecbc504e Merge: 18d2c7c5d7 39d5e7c764 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:12 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.4.4] Copy from master gitlab-ci.yml from master back to maint-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit bac8967e244e6dca0d7795bdd0cf6c49f259bd20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 12:42:14 2020 -0400 Copy from master gitlab-ci.yml from master back to maint-0.3.5 --- .gitlab-ci.yml | 32 ++------------------------------ 1 file 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(a)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

1 0

[tor/release-0.3.5] Copy from master gitlab-ci.yml from master back to maint-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit bac8967e244e6dca0d7795bdd0cf6c49f259bd20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 12:42:14 2020 -0400 Copy from master gitlab-ci.yml from master back to maint-0.3.5 --- .gitlab-ci.yml | 32 ++------------------------------ 1 file 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(a)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

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 1279db39ebf820ccbfda67919a3a2ebf1c5b0cf6 Merge: 25811d4e72 bac8967e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 352991c843e2c0404fd44178cbf3df32cc365bc1 Merge: 4e684c8695 bac8967e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 1f54007161cc8d315e7733d5d8cb2699d9f849fd Merge: 529b989675 352991c843 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 352991c843e2c0404fd44178cbf3df32cc365bc1 Merge: 4e684c8695 bac8967e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)

1 0

[tor/release-0.4.2] Copy from master gitlab-ci.yml from master back to maint-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit bac8967e244e6dca0d7795bdd0cf6c49f259bd20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 12:42:14 2020 -0400 Copy from master gitlab-ci.yml from master back to maint-0.3.5 --- .gitlab-ci.yml | 32 ++------------------------------ 1 file 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(a)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

1 0