Skip to content
This repository was archived by the owner on Aug 30, 2022. It is now read-only.

Commit bd39a6a

Browse files
authored
Redirect upload to jaegertracing cache (#29)
* Redirect upload to jaegertracing cache Signed-off-by: Isaac Hier <[email protected]> * Use new cache server Signed-off-by: Isaac Hier <[email protected]> * Try using Travis cache directories Signed-off-by: Isaac Hier <[email protected]> * Remove unnecessary secret env variable from Travis Signed-off-by: Isaac Hier <[email protected]>
1 parent e6f0644 commit bd39a6a

File tree

2 files changed

+3
-37
lines changed

2 files changed

+3
-37
lines changed

.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,10 @@ after_success:
3939
- for f in $(find build -name '*.gcno'); do gcov-6 $f; done
4040
- bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage
4141
reports"
42-
after_script: |
43-
# Hunter: upload cache to the cache server.
44-
# Copied from [cpp-ethereum](https://github.com/ethereum/cpp-ethereum/blob/develop/.travis.yml).
45-
if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" ]]; then
46-
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo pip install --upgrade requests pyopenssl; fi
47-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install requests; fi
48-
make -C $TRAVIS_BUILD_DIR/build hunter_upload_cache
49-
fi
42+
cache:
43+
directories:
44+
- "$HOME/.hunter/_Base/Cache"
5045
env:
5146
global:
5247
- LANG="en_US.UTF-8"
5348
- PATH="$TRAVIS_BUILD_DIR/cmake-download/bin:$PATH"
54-
- secure: 1Pz1mI4PZdzFf2M33snYoaYu/gWxRGK22rw5h9DYtAMFyrqcTKJOI0WnXsIHxjZ5obqVLL/MaNTnO6PbO+sKGEueqNibZhYfjUbZtAV94/uXNkc6Qn6lNALJykqAueGXIkf04CLGpQaJoS8OebFdZODZMJzad58BpckJlF9O/v2OXNx244/bl4Eu61qvbLa/IgRUnLRwGUiHY4CN7Q8+6kNn2cu0nNb2bc+S01jB9PjC+lrkP39ant9f1fY3qWkN3blhLH7OsMaQ9tgs0c/fwCRpyNl95LYodL3Zzi/F61G0PPJL/B2jCGYwFPMsjIj+O6PwF+8k9iAnmA/hUdIQ7+a2l+/Pe9HrPstJD4V99Q922INBYLvgIkvCh7HIV9NDfJ3Ok8tA9PvvGXJ4y12aWvP6QYEfdDFcX6Yrc3NraVMMsz+UhkznHiLdTrj5UwFlmro4a0iRzKeEAOfBmb/pgeD8eESR2IGaZiFsGcLQ0RHFb477fiMJzCstLm/gfhlO6pOvbTMKItEswqePoJI9g0AxQT2Ib8F58Hp91G3U7kbtubZGIT4OZAv6ePj0WnL4FojFWM8TirmPkbVeKwBggxuI85BQO2XE8HhdJPZSz+vzUPPHZbspPdqMaEbk5WgnHv10TmL83VKof48sA4GxfDuXm+NlTan4sWgdPNKpSow=

CMakeLists.txt

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchain.cmake"
66
CACHE FILEPATH
77
"Toolchain to use for building this package and dependencies")
88

9-
set(HUNTER_CACHE_SERVERS "https://github.com/isaachier/cpp-client-hunter-cache")
10-
119
include(CMakeDependentOption)
1210
include(HunterGate)
1311
HunterGate(
@@ -16,32 +14,6 @@ HunterGate(
1614
LOCAL
1715
)
1816

19-
# Copied from [cpp-ethereum]
20-
# (https://github.com/ethereum/cpp-ethereum/blob/develop/CMakeLists.txt)
21-
if(HUNTER_ENABLED)
22-
find_package(PythonInterp QUIET)
23-
if(PYTHONINTERP_FOUND)
24-
hunter_gate_self(
25-
"${HUNTER_CACHED_ROOT}"
26-
"${HUNTER_VERSION}"
27-
"${HUNTER_SHA1}"
28-
hunter_dir
29-
)
30-
set(hunter_upload_script
31-
"${hunter_dir}/maintenance/upload-cache-to-github.py")
32-
set(hunter_cache_dir "${HUNTER_GATE_ROOT}/_Base/Cache")
33-
set(hunter_tmp_dir "${HUNTER_GATE_ROOT}/tmp")
34-
add_custom_target(
35-
hunter_upload_cache
36-
${PYTHON_EXECUTABLE} ${hunter_upload_script}
37-
--username isaachier
38-
--repo-owner isaachier
39-
--repo cpp-client-hunter-cache
40-
--cache-dir ${hunter_cache_dir}
41-
--temp-dir ${hunter_tmp_dir})
42-
endif()
43-
endif()
44-
4517
project(jaegertracing VERSION 0.2.0)
4618

4719
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR

0 commit comments

Comments
 (0)