From 3bf6e998e5cde615e02b96593a07e88e99cec9cb Mon Sep 17 00:00:00 2001 From: Denis P Date: Fri, 29 Mar 2019 00:02:37 +0100 Subject: [PATCH 1/6] build android with cache! --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33d65879428..3bed195d59a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,12 +97,13 @@ test-linux: build-android: stage: build - image: parity/rust-android:gitlab-ci + image: parity/rust-parity-ethereum-android-build:stretch variables: CARGO_TARGET: armv7-linux-androideabi + <<: *docker-cache-status + <<: *collect_artifacts script: - scripts/gitlab/build-linux.sh - <<: *collect_artifacts tags: - linux-docker From b08c3d5a909b2e86956cdf2ea5b62ecf3a68f726 Mon Sep 17 00:00:00 2001 From: Denis P Date: Fri, 29 Mar 2019 13:05:17 +0100 Subject: [PATCH 2/6] windows fixes --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bed195d59a..984a9825387 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,9 +154,9 @@ build-windows: only: *releaseable_branches variables: CARGO_TARGET: x86_64-pc-windows-msvc - CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/%CI_JOB_NAME%" - RUSTC_WRAPPER: sccache - SCCACHE_DIR: "C:/ci-cache/parity-ethereum/sccache" + 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: From 28794704be61bdc7fb7fdd733c610016c6376675 Mon Sep 17 00:00:00 2001 From: Denis P Date: Fri, 29 Mar 2019 13:08:38 +0100 Subject: [PATCH 3/6] windows fixes 2 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 984a9825387..5791f77d79e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,7 +151,7 @@ build-darwin: build-windows: stage: build <<: *collect_artifacts - only: *releaseable_branches + # only: *releaseable_branches variables: CARGO_TARGET: x86_64-pc-windows-msvc CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME" From 83bf2ddba861709bf84013da1b29ce24c84a4803 Mon Sep 17 00:00:00 2001 From: Denis P Date: Fri, 29 Mar 2019 14:49:18 +0100 Subject: [PATCH 4/6] windows fixes 3 --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5791f77d79e..2fd8fce2544 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,6 +155,7 @@ build-windows: variables: CARGO_TARGET: x86_64-pc-windows-msvc CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME" + GIT_SUBMODULE_STRATEGY: none # RUSTC_WRAPPER: sccache # SCCACHE_DIR: "C:/ci-cache/parity-ethereum/sccache" script: From c914dec4d4290ace788c14f2fc62e02d67dceca9 Mon Sep 17 00:00:00 2001 From: Denis P Date: Fri, 29 Mar 2019 17:51:21 +0100 Subject: [PATCH 5/6] windows fixes 4 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fd8fce2544..aad73795830 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,7 +157,7 @@ build-windows: CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME" GIT_SUBMODULE_STRATEGY: none # RUSTC_WRAPPER: sccache - # SCCACHE_DIR: "C:/ci-cache/parity-ethereum/sccache" + # SCCACHE_DIR: "C:/ci-cache/parity-ethereum/sccache " script: - sh scripts/gitlab/build-windows.sh tags: From f61e3d0929813baf1c3c292b0181d8a3dd73d6db Mon Sep 17 00:00:00 2001 From: Denis P Date: Fri, 29 Mar 2019 22:44:45 +0100 Subject: [PATCH 6/6] windows should have sccache variables in env variables --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aad73795830..8b79633b8f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,13 +151,11 @@ build-darwin: build-windows: stage: build <<: *collect_artifacts - # only: *releaseable_branches + only: *releaseable_branches variables: CARGO_TARGET: x86_64-pc-windows-msvc CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME" GIT_SUBMODULE_STRATEGY: none - # RUSTC_WRAPPER: sccache - # SCCACHE_DIR: "C:/ci-cache/parity-ethereum/sccache " script: - sh scripts/gitlab/build-windows.sh tags: