Commit f8892168 authored by akwizgran's avatar akwizgran

Merge branch 'tor-0.3.4.8' into 'master'

Add tor-0.3.4.8 and remove unused tor 0.3.0 versions

See merge request !5
parents 61055fcf 19e6fe96
Pipeline #2491 passed with stages
in 39 minutes and 20 seconds
......@@ -105,11 +105,15 @@ def prepare_tor_android_repo(versions):
else:
# clone repo
url = versions['tor_android_repo_url']
check_call(['git', 'clone', '--recurse-submodules', url, REPO_DIR])
check_call(['git', 'clone', url, REPO_DIR])
# checkout tor-android version
check_call(['git', 'checkout', '-f', versions['tor-android']], cwd=REPO_DIR)
# initialize and/or update submodules
# (after checkout, because submodules can point to non-existent commits on master)
check_call(['git', 'submodule', 'update', '--init', '--recursive'], cwd=REPO_DIR)
# undo all changes
check_call(['git', 'reset', '--hard'], cwd=REPO_DIR)
check_call(['git', 'submodule', 'foreach', 'git', 'reset', '--hard'], cwd=REPO_DIR)
......
{
"0.3.3.7": {
"tor": "tor-0.3.3.7",
"0.3.4.8": {
"tor": "tor-0.3.4.8",
"libevent": "release-2.0.22-stable",
"openssl": "OpenSSL_1_0_2o",
"openssl": "OpenSSL_1_0_2p",
"xz": "v5.2.4",
"zlib": "v1.2.11",
"zstd": "v1.3.5",
"tor-android": "tor-android-binary-0.3.3.5-rc-3",
"tor_android_repo_url": "https://github.com/n8fr8/tor-android",
"ndk": {
"url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
"revision": "15.2.4203891",
"sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
}
},
"0.3.3.6": {
"tor": "tor-0.3.3.6",
"libevent": "release-2.0.22-stable",
"openssl": "OpenSSL_1_0_2o",
"xz": "v5.2.4",
"zlib": "v1.2.11",
"zstd": "v1.3.4",
"tor-android": "tor-android-binary-0.3.3.5-rc-3",
"tor-android": "fa1ed5505d20aae51cb4cceb51bd9c5164066259",
"tor_android_repo_url": "https://github.com/n8fr8/tor-android",
"ndk": {
"url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment