WIP: DO NOT MERGE: test artifact location

parent 85169532
Pipeline #3015 passed with stages
in 11 minutes and 2 seconds
......@@ -24,7 +24,7 @@ build:
test_build:
stage: test
script:
- docker run ${TEST_IMAGE} /bin/bash -c "./build-tor.py && ./verify-tor.py"
- docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} /bin/bash -c "./build-tor.py && ./verify-tor.py"
artifacts:
paths:
- tor-*.zip
......@@ -39,7 +39,7 @@ test_build:
test_tag:
stage: test
script:
- docker run ${TEST_IMAGE} ./verify-tor.py ${CI_BUILD_REF_NAME}
- docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} ./verify-tor.py ${CI_BUILD_REF_NAME}
artifacts:
paths:
- tor-*.zip
......
......@@ -20,14 +20,14 @@ def main():
print("Building Tor %s" % versions['tor'])
# setup Android NDK
setup_android_ndk(versions)
# setup_android_ndk(versions)
# clone and checkout tor-android repo based on tor-versions.json
prepare_tor_android_repo(versions)
# build Tor for various platforms and architectures
build()
build_android()
# build_android()
# zip geoip database
geoip_path = os.path.join(REPO_DIR, 'geoip')
......@@ -39,13 +39,13 @@ def main():
file_list = ['tor_linux-x86_64.zip', 'geoip.zip']
zip_name = pack(versions, file_list)
# zip Android binaries together
file_list_android = ['tor_arm_pie.zip', 'tor_arm.zip', 'tor_x86_pie.zip', 'tor_x86.zip',
'geoip.zip']
zip_name_android = pack(versions, file_list_android, android=True)
# file_list_android = ['tor_arm_pie.zip', 'tor_arm.zip', 'tor_x86_pie.zip', 'tor_x86.zip',
# 'geoip.zip']
# zip_name_android = pack(versions, file_list_android, android=True)
# create POM file from template
pom_name = create_pom_file(versions)
pom_name_android = create_pom_file(versions, android=True)
# pom_name_android = create_pom_file(versions, android=True)
# create sources jar
jar_name = create_sources_jar(versions)
......@@ -56,10 +56,15 @@ def main():
for file in file_list + [zip_name, jar_name, pom_name]:
sha256hash = get_sha256(os.path.join(REPO_DIR, file))
print("%s: %s" % (file, sha256hash))
print("Android:")
for file in file_list_android + [zip_name_android, jar_name_android, pom_name_android]:
sha256hash = get_sha256(os.path.join(REPO_DIR, file))
print("%s: %s" % (file, sha256hash))
# print("Android:")
# for file in file_list_android + [zip_name_android, jar_name_android, pom_name_android]:
# sha256hash = get_sha256(os.path.join(REPO_DIR, file))
# print("%s: %s" % (file, sha256hash))
check_call(['pwd'])
check_call(['ls', '-la'])
check_call(['pwd', REPO_DIR])
check_call(['ls', '-la', REPO_DIR])
def setup_android_ndk(versions):
......@@ -256,7 +261,7 @@ def create_sources_jar(versions):
for file in jar_files:
reset_time(file)
jar_name = get_sources_file_name(versions)
jar_path = os.path.abspath(os.path.join(REPO_DIR, jar_name))
jar_path = os.path.abspath(jar_name)
rel_paths = [os.path.relpath(f, EXT_DIR) for f in sorted(jar_files)]
check_call(['jar', 'cf', jar_path] + rel_paths, cwd=EXT_DIR)
return jar_name
......@@ -267,7 +272,7 @@ def create_pom_file(versions, android=False):
pom_name = get_pom_file_name(versions, android)
template = 'template-android.pom' if android else 'template.pom'
with open(template, 'rt') as infile:
with open(os.path.join(REPO_DIR, pom_name), 'wt') as outfile:
with open(pom_name, 'wt') as outfile:
for line in infile:
outfile.write(line.replace('VERSION', tor_version))
return pom_name
......
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