[tor-commits] [collector/release] Use metrics-base ant task to fetch metrics-lib.

[karsten@xxxxxxxxxxxxxx]

commit de03530b98bd66eee404e4483d930baf62a8f3e1
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Fri Sep 27 10:05:35 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 5bd5623..897c9da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 variables:
   GIT_STRATEGY: clone
-  METRICS_LIB_VERSION: "2.7.0"
   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 0674958..07c2a00 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af
+Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits