Hunter: Update upload procedure

Author: chfast

.travis.yml

@@ -65,6 +65,8 @@ cache:
 install: |
     if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       ./scripts/install_cmake.sh && ./scripts/install_solc_lllc.sh;
+      pyenv local 3.6
+      pip install --user requests
     fi
     export HOMEBREW_NO_AUTO_UPDATE=1
     ./scripts/install_deps.sh
@@ -77,13 +79,6 @@ script:
 after_success:
     - pip install --user codecov
     - codecov
-after_script: |
-    # Hunter: upload cache to the cache server.
-    if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" ]]; then
-      if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo pip install --upgrade requests pyopenssl; fi
-      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install requests; fi
-      make -C $TRAVIS_BUILD_DIR/build hunter_upload_cache
-    fi
 deploy:
     # This is the deploy target for the native build (Linux and macOS)
     # which generates ZIPs per commit.  We are in agreement that

CMakeLists.txt

@@ -51,40 +51,24 @@ set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
 set(HUNTER_CONFIGURATION_TYPES Release)
 set(HUNTER_JOBS_NUMBER 4)
 set(HUNTER_CACHE_SERVERS "https://github.com/ethereum/hunter-cache")
+set(HUNTER_PASSWORDS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Hunter/passwords.cmake)
+
+# In CI builds upload the binaries if the GITHUB_USER_PASSWORD was decrypted
+# (only for branches and internal PRs).
+if("$ENV{CI}" AND NOT "$ENV{GITHUB_USER_PASSWORD}" STREQUAL "")
+    set(run_upload YES)
+else()
+    set(run_upload NO)
+endif()
+option(HUNTER_RUN_UPLOAD "Upload binaries to the cache server" ${run_upload})
+
 include(HunterGate)
 HunterGate(
     URL "https://github.com/ruslo/hunter/archive/v0.20.9.tar.gz"
     SHA1 "8f7cf6d719d05c49224a4ebeba90c6bb90b90f4a"
     LOCAL
 )
 
-if(HUNTER_ENABLED)
-    # Find Python executable,
-    # prefer version 3 that has requests module included.
-    set(Python_ADDITIONAL_VERSIONS 3)
-    find_package(PythonInterp)
-    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 name and version should be set after cmake_policy CMP0048
 project(cpp-ethereum VERSION "1.3.0")
 

appveyor.yml

@@ -39,6 +39,11 @@ cache:
   - build/deps -> cmake/ProjectLibFF.cmake
 install:
   - git submodule update --init --recursive
+
+  # Python 3
+  - set PATH=C:\Python36-x64;C:\Python36-x64\Scripts;%PATH%
+  - pip install requests
+
   - scripts/install_deps.bat
   - set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps
 before_build: |
@@ -49,12 +54,6 @@ build_script:
     - msbuild cpp-ethereum.sln /p:Configuration=%CONFIGURATION% /m:%NUMBER_OF_PROCESSORS% /v:minimal
     - cd %APPVEYOR_BUILD_FOLDER%
     - scripts\release.bat %CONFIGURATION% %ETHEREUM_DEPS_PATH% %TESTS%
-after_build:
-  ps: |
-    if (-not $env:appveyor_pull_request_number) {
-      pip install --user requests
-      cmake --build build --target hunter_upload_cache
-    }
 test_script:
     - cd %APPVEYOR_BUILD_FOLDER%
     - scripts\tests.bat %TESTS% %CONFIGURATION% %APPVEYOR_BUILD_FOLDER% %ETHEREUM_DEPS_PATH%

circle.yml

@@ -6,15 +6,6 @@ defaults:
       command: |
         git submodule update --init
 
-  upload-hunter-cache: &upload-hunter-cache
-    run:
-      name: "Upload Hunter cache"
-      working_directory: ~/build
-      command: |  # Upload Hunter cache if not PR build.
-        if [ ! "$CIRCLE_PR_NUMBER" ]; then
-          cmake --build . --target hunter_upload_cache
-        fi
-
   environment-info: &environment-info
     run:
       name: "Environment info"
@@ -112,7 +103,6 @@ defaults:
     - *environment-info
     - *restore-deps-cache
     - *configure
-    - *upload-hunter-cache
     - *build
     - *save-deps-cache
     - *store-eth
@@ -169,13 +159,12 @@ jobs:
       - *environment-info
       - run:
           name: "Install macOS dependencies"
+          # Python3 and requests are needed for Hunter upload.
           command: |
-            pip install -q requests codecov &
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install -q cmake ninja leveldb &
-            wait
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install -q cmake ninja python3 leveldb
+            pip3 install -q requests codecov
       - *restore-deps-cache
       - *configure
-      - *upload-hunter-cache
       - *build
       - *save-deps-cache
       - *store-eth

cmake/Hunter/passwords.cmake

@@ -0,0 +1,12 @@
+
+hunter_upload_password(
+    # REPO_OWNER + REPO = https://github.com/ethereum/hunter-cache
+    REPO_OWNER "ethereum"
+    REPO "hunter-cache"
+
+    # USERNAME = https://github.com/hunter-cache-bot
+    USERNAME "hunter-cache-bot"
+
+    # PASSWORD = GitHub token saved as a secure environment variable
+    PASSWORD "$ENV{GITHUB_USER_PASSWORD}"
+)