Upgrade Hunter to 0.20.34

.travis.yml

@@ -1,7 +1,7 @@
 language: cpp
 env:
   global:
-    - secure: "fHPxJHwBxb7yTxmGm9pKLbZh0r3Xd7PAfoiiOMPOkFYbsQUJQ+Xbj7eDdpJYN9aTFmsEE6WiidUet6TvWUlC2c2Wr3vb16D0ANgnFGap2BXWrpsJQpn7m9jIs86z7jzIbZoc3Xf24ohpwba3XivI0j33F0RLRbVcsRUo/Km46kuejBg9Qef7+oFIWQYCYgbWoGmKJv030RlUgFgwnIR1vD7K09A3zm6rYJTCvP9swr3XBO8dzWuL/+vfX+xHxkNPFCzq0ETVf2VSD8giIeAmKEQoiTWzieeGZvdnknY2kWVySgAkw8wVC8+N4N0MhvagzrtWzGsjnQQCWlc6QL4naOTb36z7wAg0iFtGvuhEN2OJhtGDW9vyhiVn+sAsu0fq7MH0idG1FrWc3lL5ogqdqbCpdbekCGSphhtRxqkD/iDfEiY4QaO/9OMlaTxUUQsgGIXAB+UZFlBO0TVYu+TkhYr2nk2cmhvGhz5tqsWpiks0oKbySYxuLcDMO20FzEKqQsroCLo70LKOW5CkFBDUCpp+WXgaFnxbyxw6G4Zl+EVZpBXPb35+oRjVv0Gs2ubGjlmEZzfzVZkjBqAjJ7c5eHEIUizyPAgxQVQaj+cV1s5aHpWPOLGvTLYJkEvRVSG0oSDdiH1wtVHuf/7rTZsupxHGVvbohZGHxiIZHfOwYZc="
+    - secure: "Pu2hPyp3Ym3hmkW9iXVZObfE7tA3ITSaeR05VguJ9czJAMgaT7LmEN4LDoR2sQHbRAv+8QngbNUFpglzvZLIBIEefyEA39DThZptkKJ+hCUerRajfmXywSXCwPC7A1uTEY1YoUDlGvxVZA3Z7f17GFtKtDuHjLSWmrxHAM6wjK+qCweEq0umJJ+N+2DX2UpVLlWgYoknYSGipfjHRBEgPp4NRh08yvpDTFYSVQeL0qL7LbyAtkx6qhLCK6JZ2CsP3INQOoRwc8jP6VIFbuoHl3lkOzayNM49/e9wDdZ8FGqp0HjUFi7EYi/78Uvje7CrgdCiSVwoHbtAvcyPYcxu+qXzwh4AxslRL7UJtOzTbRaXfJvqt2oqtttFjD0Dk/iwnAthg7Su6UohivcUVj/9p1X1KdDbLJcoTag/MBcZP7VJDgnHjyqYwVciT1ZV0RWfuLBI584vFMTlsdzFXt384mUTCN02BOnRnw3Miq4a5irFXnDy23TdGersk7b//FPIBIhPv/wxCjUkJzTmt7ska5jACb/FHUoOyrE5mQLSVZbh/zlsIKf8yWZy7q7caowmwyPYZtAqNZWj1JmVs2c+0RmX2c76kCTHX4ocCcDx1QqV49/+R1Ah+pA7X7kcr9MklzL9z/lkAA7z5SF/UzdoGfBNicMKz5hUFixBqZ04ATw="
 branches:
     only:
         - /^v\d+\..+$/
@@ -28,7 +28,7 @@ before_install: |
     fi
     if [ "$TRAVIS_OS_NAME" = linux ]; then
       scripts/install_cmake.sh
-      pyenv local 3.6
+      pyenv global 3.6
       pip install --user requests
     elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
       HOMEBREW_NO_AUTO_UPDATE=1 brew install -q python3
@@ -44,12 +44,6 @@ script:
     - cmake --build build --target package
 
 deploy:
-  - provider: script
-    script: make -C build hunter_upload_cache
-    skip_cleanup: true
-    on:
-      all_branches: true
-
   - provider: releases
     api_key:
       secure: "KfYTW8o20BUEZc57vF3H4+qXgpDsMeWk3N4IQtNKkdhFzEUzQaXi1WHRtvcR5kq+rvDiXwy0fELglDZpCSa4wfQvM5fKlb7WPQgkyRZyCpwnXlqvb6dL8KxJekQHZ5fFpzc/ow0dx/UqzJgv+cWDnBEK/gl+9j+vt9oq1nV1LSaxmtO3Qs7y+ffq5Tbzo06q6/CfeyOZi23g+AYtnoEBKwYqa807atWM6cJpudPmyhYHQFgaQZMfzk44z/MnJb7nxtkqcx57KWaY2EHlFj6yrHMcXWyM8j+P0ZBwUbOpHkWvBpgmDKR2J3u0WmiJDDo3E6K0g9QgbAnF5+yqvpBC5kaSHAaicJ3+7ghSgo18Eea0BkLbmb0t93h5NJfRhg0GDjgG3LkHao9ALM35x3OXG38JI6bOLd6jSV2Vkg8qLWAZjP1TUb/4VTIFnyITSv+xrY7ZP9D0XcRybZ5Z0YnaI/J6NFJct9ICAlQ6cHkS0MO6PICTSbZbKhbDZP0Lt6iDDUeje5+uvPAl0uuzuciSqEM77JWYN/edOXurgkfljEny3P96AW70gUUBTVEE+4tjng4DMLHCH/1Jg/WfMPfSVC3AUR0WbvjMki6veMt37fy8Jys8gFpwZbMG3cCSkYXDDFWF/Q+p2v6pX76CZZz+LxO2XcZ7x4bw+c7AGzRWV7c="

CMakeLists.txt

@@ -5,43 +5,19 @@ include(cmake/cable/bootstrap.cmake)
 include(CableBuildInfo)
 include(CableBuildType)
 include(CableToolchains)
+include(HunterGate)
+
+include(defaults/HunterCacheServers)
 
 cable_configure_toolchain(DEFAULT cxx11)
 
 set(HUNTER_CONFIGURATION_TYPES Release)
-set(HUNTER_CACHE_SERVERS "https://github.com/ethereum/hunter-cache")
-include(HunterGate)
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.19.213.tar.gz"
-    SHA1 "59b2b880178bdc1e9cce83f279f1d88feefa07a2"
+    URL "https://github.com/ruslo/hunter/archive/v0.20.34.tar.gz"
+    SHA1 "2f04d1beffdf39db1c40d8347beb8c10bbe9b8ed"
     LOCAL
 )
 
-if(HUNTER_ENABLED)
-	find_package(PythonInterp 3)
-	if(PYTHONINTERP_FOUND)
-		hunter_gate_self(
-			"${HUNTER_CACHED_ROOT}"
-			"${HUNTER_VERSION}"
-			"${HUNTER_SHA1}"
-			hunter_dir
-		)
-		set(hunter_upload_script "${hunter_dir}/maintenance/upload-cache-to-github.py")
-		set(hunter_cache_dir "${HUNTER_GATE_ROOT}/_Base/Cache")
-		set(hunter_tmp_dir "${HUNTER_GATE_ROOT}/tmp")
-		add_custom_target(
-			hunter_upload_cache
-			${PYTHON_EXECUTABLE} ${hunter_upload_script}
-			--username hunter-cache-bot
-			--repo-owner ethereum
-			--repo hunter-cache
-			--cache-dir ${hunter_cache_dir}
-			--temp-dir ${hunter_tmp_dir}
-		)
-	endif()
-endif()
-
-
 project(ethminer)
 set(PROJECT_VERSION 0.15.0.dev0)
 

appveyor.yml

@@ -5,13 +5,14 @@ branches:
     - /v\d+\..+/
     - /release.*/
     - appveyor
+    - hunter
 clone_depth: 1
 os: Visual Studio 2015
 configuration:
   - Release
   - RelWithDebInfo
 environment:
-  GITHUB_USER_PASSWORD:
+  HUNTER_CACHE_TOKEN:
     secure: VnpF1MH5MEFvUI5MiMMMFlmbDdst+bfom5ZFVgalYPp/SYDhbejjXJm9Dla/IgpC
 
 install: | # Download CUDA Windows installer (local) and extract /compiler/* to /CUDA/vX.0/ zip archive.
@@ -32,9 +33,6 @@ after_build:
     if ($env:configuration -ne "Release") {
       Get-Item build/ethminer-*-Windows.* | Rename-Item -NewName { $_.name -Replace 'ethminer','ethminer-dbg' }
     }
-    if (-not $env:appveyor_pull_request_number) {
-      cmake --build build --target hunter_upload_cache
-    }
 
 artifacts:
   - path: build/ethminer-*.zip

circle.yml

@@ -4,18 +4,12 @@ jobs:
     docker:
       - image: nvidia/cuda:9.1-devel-ubuntu16.04
     steps:
-      - run: apt-get update && apt-get install -qy git cmake mesa-common-dev libidn11-dev
+      - run: apt-get update && apt-get install -qy git cmake mesa-common-dev libidn11-dev python3-requests
 
       - checkout
       - run: git submodule update --init --recursive
 
-      - restore_cache:
-          key: hunter-v3
       - run: cmake -DHUNTER_JOBS_NUMBER=4 -DETHASHCUDA=ON -DAPICORE=ON -H. -Bbuild
-      - save_cache:
-          key: hunter-v3
-          paths:
-            - /root/.hunter/_Base/Cache
       - run: cmake --build build -- -j4
       - store_artifacts:
           path: build/ethminer/ethminer