commit bbc5c16d7b748ab05707a31779849f216a89f1b5
Author: Karsten Loesing <karsten.loes...@gmx.net>
Date: Fri Sep 27 10:06:13 2019 +0200
Use metrics-base ant task to fetch metrics-lib.
Implements part of #31649.
---
.gitlab-ci.yml | 7 +------
src/build | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b67b5a4..897c9da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
variables:
GIT_STRATEGY: clone
- METRICS_LIB_VERSION: "2.6.2"
JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
stages:
@@ -15,11 +14,7 @@ test:
- git submodule init
- git submodule update
- mkdir lib
- - mkdir tmp
- - pushd tmp
- - curl
https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$METRICS_LIB_VERSION.tar.gz
| tar xzf -
- - popd
- - mv
tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar
lib
+ - ant fetch-metrics-lib
- ant -lib /usr/share/java resolve
- ant test
- ant checks
diff --git a/src/build b/src/build
index 75cda35..07c2a00 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097
+Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
