From 1b0c59759fbcff3abf103d19ed6c8586a0e2c992 Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 14 Jan 2019 12:13:12 +0100 Subject: [PATCH 1/6] build-unix update --- scripts/gitlab/build-unix.sh | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/scripts/gitlab/build-unix.sh b/scripts/gitlab/build-unix.sh index cf6bfe1476c..b099815a96d 100755 --- a/scripts/gitlab/build-unix.sh +++ b/scripts/gitlab/build-unix.sh @@ -10,27 +10,19 @@ echo "CARGO_TARGET: " $CARGO_TARGET echo "CC: " $CC echo "CXX: " $CXX -echo "__________CARGO CONFIG__________" +echo "_____ Building target: "$CARGO_TARGET" _____" if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] then - # use build container's cargo config - cat /.cargo/config +# only thing we need for android + time cargo build --target $CARGO_TARGET --release -p parity-clib --features final else - mkdir -p .cargo - rm -f .cargo/config - echo "[target.$CARGO_TARGET]" >> .cargo/config - echo "linker= \"$CC\"" >> .cargo/config - cat .cargo/config + time cargo build --target $CARGO_TARGET --release --features final + time cargo build --target $CARGO_TARGET --release -p evmbin + time cargo build --target $CARGO_TARGET --release -p ethstore-cli + time cargo build --target $CARGO_TARGET --release -p ethkey-cli + time cargo build --target $CARGO_TARGET --release -p whisper-cli fi - -echo "_____ Building target: "$CARGO_TARGET" _____" -time cargo build --target $CARGO_TARGET --release --features final -time cargo build --target $CARGO_TARGET --release -p evmbin -time cargo build --target $CARGO_TARGET --release -p ethstore-cli -time cargo build --target $CARGO_TARGET --release -p ethkey-cli -time cargo build --target $CARGO_TARGET --release -p whisper-cli - echo "_____ Post-processing binaries _____" rm -rf artifacts mkdir -p artifacts From eb2170aea54e23541463250c428141ebcd27aff6 Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 14 Jan 2019 12:19:25 +0100 Subject: [PATCH 2/6] .gitlab-ci update --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d5f483da12..59d6d5f063f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,7 @@ build-android: script: - scripts/gitlab/build-unix.sh tags: - - rust-arm + - linux-docker allow_failure: true test-beta: From 8c00c9f2bde3d9dc07266704402158b03e5acb85 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Tue, 15 Jan 2019 16:15:47 +0300 Subject: [PATCH 3/6] Update build-unix.sh add android postprocessing --- scripts/gitlab/build-unix.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/gitlab/build-unix.sh b/scripts/gitlab/build-unix.sh index b099815a96d..73f56c7254d 100755 --- a/scripts/gitlab/build-unix.sh +++ b/scripts/gitlab/build-unix.sh @@ -15,6 +15,7 @@ if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] then # only thing we need for android time cargo build --target $CARGO_TARGET --release -p parity-clib --features final + ls ../../target/$CARGO_TARGET/release/ else time cargo build --target $CARGO_TARGET --release --features final time cargo build --target $CARGO_TARGET --release -p evmbin @@ -29,11 +30,17 @@ mkdir -p artifacts cd artifacts mkdir -p $CARGO_TARGET cd $CARGO_TARGET -cp -v ../../target/$CARGO_TARGET/release/parity ./parity -cp -v ../../target/$CARGO_TARGET/release/parity-evm ./parity-evm -cp -v ../../target/$CARGO_TARGET/release/ethstore ./ethstore -cp -v ../../target/$CARGO_TARGET/release/ethkey ./ethkey -cp -v ../../target/$CARGO_TARGET/release/whisper ./whisper +if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] +then +# only thing we need for android + cp -v ../../target/$CARGO_TARGET/release/parity ./parity-clib +else + cp -v ../../target/$CARGO_TARGET/release/parity ./parity + cp -v ../../target/$CARGO_TARGET/release/parity-evm ./parity-evm + cp -v ../../target/$CARGO_TARGET/release/ethstore ./ethstore + cp -v ../../target/$CARGO_TARGET/release/ethkey ./ethkey + cp -v ../../target/$CARGO_TARGET/release/whisper ./whisper +fi # stripping can also be done on release build time From 4b93ba51417973bf7bd380a3b0795a08affc31db Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Tue, 15 Jan 2019 16:37:29 +0300 Subject: [PATCH 4/6] path to android lib libparity.so --- scripts/gitlab/build-unix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gitlab/build-unix.sh b/scripts/gitlab/build-unix.sh index 73f56c7254d..41ed52f0c97 100755 --- a/scripts/gitlab/build-unix.sh +++ b/scripts/gitlab/build-unix.sh @@ -33,7 +33,7 @@ cd $CARGO_TARGET if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] then # only thing we need for android - cp -v ../../target/$CARGO_TARGET/release/parity ./parity-clib + cp -v ../../target/$CARGO_TARGET/release/libparity.so ./libparity.so else cp -v ../../target/$CARGO_TARGET/release/parity ./parity cp -v ../../target/$CARGO_TARGET/release/parity-evm ./parity-evm From dd66edb1619f9c90ea3dd004c0e3bf804acadf04 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Tue, 15 Jan 2019 17:13:34 +0300 Subject: [PATCH 5/6] fix path to libparity --- scripts/gitlab/build-unix.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/gitlab/build-unix.sh b/scripts/gitlab/build-unix.sh index 41ed52f0c97..9bb6cd0f3f2 100755 --- a/scripts/gitlab/build-unix.sh +++ b/scripts/gitlab/build-unix.sh @@ -15,7 +15,6 @@ if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] then # only thing we need for android time cargo build --target $CARGO_TARGET --release -p parity-clib --features final - ls ../../target/$CARGO_TARGET/release/ else time cargo build --target $CARGO_TARGET --release --features final time cargo build --target $CARGO_TARGET --release -p evmbin From 79aa73734dfb1e5ca62f0192bce799a92e7ba683 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Tue, 15 Jan 2019 17:30:32 +0300 Subject: [PATCH 6/6] add android lib to artifacts --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59d6d5f063f..a1a1c979987 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,6 +148,7 @@ build-android: tags: - linux-docker allow_failure: true + <<: *collect_artifacts test-beta: stage: optional