From e4c2fe9e72df4323362e784b2c3d1960f2b9500e Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Wed, 27 Mar 2019 16:47:08 +0300 Subject: [PATCH] Initial support sccache for windows build (#10520) * Initial support sccache for win build * show sccache stats * cache paths for shared runners * sccache status is in the script. * removed windows test for now --- .gitlab-ci.yml | 16 +++++++++------- scripts/gitlab/build-windows.sh | 5 +++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 217c49126..33d658794 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ variables: .docker-cache-status: &docker-cache-status variables: - CARGO_HOME: "/cargo/${CI_JOB_NAME}" + CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" before_script: - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server - sccache -s @@ -102,18 +102,18 @@ build-android: CARGO_TARGET: armv7-linux-androideabi script: - scripts/gitlab/build-linux.sh + <<: *collect_artifacts tags: - linux-docker - <<: *collect_artifacts build-linux: &build-linux stage: build only: *releaseable_branches <<: *docker-cache-status + <<: *collect_artifacts script: - scripts/gitlab/build-linux.sh - sccache -s - <<: *collect_artifacts build-linux-i386: <<: *build-linux @@ -136,6 +136,7 @@ build-linux-armhf: build-darwin: stage: build only: *releaseable_branches + <<: *collect_artifacts variables: CARGO_TARGET: x86_64-apple-darwin CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" @@ -145,19 +146,20 @@ build-darwin: - scripts/gitlab/build-linux.sh tags: - rust-osx - <<: *collect_artifacts build-windows: stage: build + <<: *collect_artifacts only: *releaseable_branches variables: CARGO_TARGET: x86_64-pc-windows-msvc - CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" + CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/%CI_JOB_NAME%" + RUSTC_WRAPPER: sccache + SCCACHE_DIR: "C:/ci-cache/parity-ethereum/sccache" script: - sh scripts/gitlab/build-windows.sh tags: - rust-windows - <<: *collect_artifacts publish-docker: stage: publish @@ -173,6 +175,7 @@ publish-docker: publish-snap: &publish-snap stage: publish only: *releaseable_branches + <<: *collect_artifacts image: snapcore/snapcraft variables: BUILD_ARCH: amd64 @@ -183,7 +186,6 @@ publish-snap: &publish-snap - linux-docker script: - scripts/gitlab/publish-snap.sh - <<: *collect_artifacts publish-snap-i386: <<: *publish-snap diff --git a/scripts/gitlab/build-windows.sh b/scripts/gitlab/build-windows.sh index d4176c758..7ddf4453e 100755 --- a/scripts/gitlab/build-windows.sh +++ b/scripts/gitlab/build-windows.sh @@ -4,11 +4,14 @@ set -u # treat unset variables as error set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt" set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64" +sccache -s echo "__________Show ENVIROMENT__________" echo "CI_SERVER_NAME: " $CI_SERVER_NAME echo "CARGO_HOME: " $CARGO_HOME echo "CARGO_TARGET: " $CARGO_TARGET +echo "RUSTC_WRAPPER: " $RUSTC_WRAPPER +echo "SCCACHE_DIR: " $SCCACHE_DIR echo "_____ Building target: "$CARGO_TARGET" _____" time cargo build --target $CARGO_TARGET --release --features final @@ -44,3 +47,5 @@ do done cp parity.exe.sha256 parity.sha256 cp parity.exe.sha3 parity.sha3 + +sccache -s