From db86545dfcd9e3a9e26aa3e93fc7f54e3c9acdc6 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 10 Mar 2022 20:38:38 +0000
Subject: [PATCH] Map output directory instead of repo directory.
---
.gitignore | 1 +
.gitlab-ci.yml | 12 ++++++------
tor-build/output/.gitkeep | 0
3 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 tor-build/output/.gitkeep
diff --git a/.gitignore b/.gitignore
index df36ff4..61d8392 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/android-ndk
/tor-build
!/tor-build/Makefile
+!/tor-build/output/.gitkeep
/android-ndk.zip
tor-*.jar
tor-*.pom
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95cee32..6b549ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ build:
test_build_android:
extends: .base-test
script:
- - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} /bin/bash -c "./build_tor_android.py && ./verify_tor_android.py"
+ - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} /bin/bash -c "./build_tor_android.py && ./verify_tor_android.py"
allow_failure: true
except:
- tags
@@ -42,7 +42,7 @@ test_build_android:
test_build_linux:
extends: .base-test
script:
- - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} /bin/bash -c "./build_tor_linux.py && ./verify_tor_linux.py"
+ - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} /bin/bash -c "./build_tor_linux.py && ./verify_tor_linux.py"
allow_failure: true
except:
- tags
@@ -50,7 +50,7 @@ test_build_linux:
test_build_windows:
extends: .base-test
script:
- - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} /bin/bash -c "./build_tor_windows.py && ./verify_tor_windows.py"
+ - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} /bin/bash -c "./build_tor_windows.py && ./verify_tor_windows.py"
allow_failure: true
except:
- tags
@@ -58,21 +58,21 @@ test_build_windows:
test_tag_android:
extends: .base-test
script:
- - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} ./verify_tor.py ${CI_BUILD_REF_NAME}
+ - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} ./verify_tor.py ${CI_BUILD_REF_NAME}
only:
- tags
test_tag_linux:
extends: .base-test
script:
- - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} ./verify_tor_linux.py ${CI_BUILD_REF_NAME}
+ - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} ./verify_tor_linux.py ${CI_BUILD_REF_NAME}
only:
- tags
test_tag_windows:
extends: .base-test
script:
- - docker run -v `pwd`:/opt/tor-reproducer ${TEST_IMAGE} ./verify_tor_windows.py ${CI_BUILD_REF_NAME}
+ - docker run -v `pwd`/tor-build/output:/opt/tor-reproducer/tor-build/output ${TEST_IMAGE} ./verify_tor_windows.py ${CI_BUILD_REF_NAME}
only:
- tags
diff --git a/tor-build/output/.gitkeep b/tor-build/output/.gitkeep
new file mode 100644
index 0000000..e69de29
--
GitLab