grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build android with cache, win fixes (#10546)

Browse Source 
* build android with cache!

* windows fixes

* windows fixes 2

* windows fixes 3

* windows fixes 4

* windows should have sccache variables in env variables
This commit is contained in:
TriplEight 2019-03-30 20:29:08 +01:00 committed by Talha Cross
parent 8840a293dd
commit 440e52f410
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -97,12 +97,13 @@ test-linux:
build-android: build-android:
stage: build stage: build
image: parity/rust-android:gitlab-ci image: parity/rust-parity-ethereum-android-build:stretch
variables: variables:
CARGO_TARGET: armv7-linux-androideabi CARGO_TARGET: armv7-linux-androideabi
<<: *docker-cache-status
<<: *collect_artifacts
script: script:
- scripts/gitlab/build-linux.sh - scripts/gitlab/build-linux.sh
<<: *collect_artifacts
tags: tags:
- linux-docker - linux-docker
@ -153,9 +154,8 @@ build-windows:
only: *releaseable_branches only: *releaseable_branches
variables: variables:
CARGO_TARGET: x86_64-pc-windows-msvc CARGO_TARGET: x86_64-pc-windows-msvc
CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/%CI_JOB_NAME%" CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME"
RUSTC_WRAPPER: sccache GIT_SUBMODULE_STRATEGY: none
SCCACHE_DIR: "C:/ci-cache/parity-ethereum/sccache"
script: script:
- sh scripts/gitlab/build-windows.sh - sh scripts/gitlab/build-windows.sh
tags: tags: