Use metrics-base ant task to fetch metrics-lib.

Implements part of #31649.
This commit is contained in:
Karsten Loesing 2019-09-27 10:05:35 +02:00
parent 18877fdb4d
commit de03530b98
2 changed files with 2 additions and 7 deletions

View File

@ -1,6 +1,5 @@
variables: variables:
GIT_STRATEGY: clone GIT_STRATEGY: clone
METRICS_LIB_VERSION: "2.7.0"
JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
stages: stages:
@ -15,11 +14,7 @@ test:
- git submodule init - git submodule init
- git submodule update - git submodule update
- mkdir lib - mkdir lib
- mkdir tmp - ant fetch-metrics-lib
- 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 -lib /usr/share/java resolve - ant -lib /usr/share/java resolve
- ant test - ant test
- ant checks - ant checks

@ -1 +1 @@
Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4