ci: touch random rust file to trigger real builds

.gitlab-ci.yml

@@ -8,7 +8,7 @@ image:                             parity/rust:gitlab-ci
 
 variables:
   CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "${CI_PROJECT_DIR}/cargo"
+  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   BUILD_TARGET:                    ubuntu
   BUILD_ARCH:                      amd64
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
@@ -16,8 +16,8 @@ variables:
 cache:
   key:                             "${CI_JOB_NAME}"
   paths:
-    - ${CI_PROJECT_DIR}/target/
-    - ${CI_PROJECT_DIR}/cargo/
+    - ./target
+    - ./.cargo
 
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
   only:                            &releaseable_branches
@@ -46,7 +46,7 @@ test-linux:
   variables:
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-stable
 
@@ -77,11 +77,6 @@ build-darwin:
 build-windows:
   stage:                           build
   only:                            *releaseable_branches
-  cache:
-    key:                           "${CI_JOB_NAME}"
-    paths:
-      - "%CI_PROJECT_DIR%/target/"
-      - "%CI_PROJECT_DIR%/cargo/"
   variables:
     CARGO_TARGET:                  x86_64-pc-windows-msvc
   script:
@@ -103,9 +98,7 @@ publish-docker:
 
 publish-awss3:
   stage:                           publish
-  only:
-    - nightly
-    - /^v2.*$/
+  only:                            *releaseable_branches
   cache: {}
   dependencies:
     - build-linux
@@ -130,7 +123,7 @@ docs-jsonrpc:
 cargo-audit:
   stage:                           optional
   script:
-    - scripts/gitlab/audit.sh
+    - scripts/gitlab/cargo-audit.sh
   tags:
     - rust-stable
 
@@ -140,7 +133,7 @@ test-android:
   variables:
     CARGO_TARGET:                  armv7-linux-androideabi
   script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-arm
 
@@ -152,22 +145,17 @@ test-darwin:
     CXX:                           g++
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-osx
 
 test-windows:
   stage:                           optional
-  cache:
-    key:                           "${CI_JOB_NAME}"
-    paths:
-      - "%CI_PROJECT_DIR%/target/"
-      - "%CI_PROJECT_DIR%/cargo/"
   variables:
     CARGO_TARGET:                  x86_64-pc-windows-msvc
     RUN_TESTS:                     "true"
   script:
-    - sh scripts/gitlab/test.sh stable
+    - sh scripts/gitlab/test-all.sh stable
   tags:
    - rust-windows
 
@@ -176,7 +164,7 @@ test-beta:
   variables:
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh beta
+    - scripts/gitlab/test-all.sh beta
   tags:
     - rust-beta
 
@@ -185,6 +173,6 @@ test-nightly:
   variables:
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh nightly
+    - scripts/gitlab/test-all.sh nightly
   tags:
     - rust-nightly

README.md

@@ -5,8 +5,6 @@
 <p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>
 
 <p align="center"><a href="https://gitlab.parity.io/parity/parity/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity/badges/master/build.svg" /></a>
-<a href="https://codecov.io/gh/paritytech/parity-ethereum" target="_blank"><img src="https://codecov.io/gh/paritytech/parity-ethereum/branch/master/graph/badge.svg" /></a>
-<a href="https://build.snapcraft.io/user/paritytech/parity" target="_blank"><img src="https://build.snapcraft.io/badge/paritytech/parity.svg" /></a>
 <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>
 
 **Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services.
@@ -60,26 +58,6 @@ Once you have `rustup` installed, then you need to install:
 
 Make sure that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source.
 
-## Install from the Snapcraft Store
-
-In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
-
-```bash
-sudo snap install parity
-```
-
-Alternatively, if you want to contribute testing the upcoming release:
-
-```bash
-sudo snap install parity --beta
-```
-
-Moreover, to test the latest code from the master branch:
-
-```bash
-sudo snap install parity --edge
-```
-
 ## Build from Source Code
 
 ```bash

scripts/docker/README.md

@@ -0,0 +1,40 @@
+## Usage
+
+```docker build -f docker/ubuntu/Dockerfile --tag ethcore/parity:branch_or_tag_name .```
+
+## Usage - CentOS
+
+Builds a lightweight non-root Parity docker image:
+```
+git clone https://github.com/paritytech/parity-ethereum.git
+cd parity-ethereum
+./docker/centos/build.sh
+```
+
+Fully customised build:
+```
+PARITY_IMAGE_REPO=my-personal/parity \
+PARITY_BUILDER_IMAGE_TAG=build-latest \
+PARITY_RUNNER_IMAGE_TAG=centos-parity-experimental \
+./docker/centos/build.sh
+```
+
+Default values:
+```
+# The image name
+PARITY_IMAGE_REPO - parity/parity
+
+# The tag to be used for builder image, git commit sha will be appended
+PARITY_BUILDER_IMAGE_TAG - build
+
+# The tag to be used for runner image
+PARITY_RUNNER_IMAGE_TAG - latest
+```
+
+All default ports you might use will be exposed:
+```
+#           secret
+#      ipfs store     ui   rpc  ws   listener  discovery
+#      ↓    ↓         ↓    ↓    ↓    ↓         ↓
+EXPOSE 5001 8082 8083 8180 8545 8546 30303/tcp 30303/udp
+```

scripts/docker/alpine/Dockerfile

@@ -0,0 +1,43 @@
+FROM alpine:edge AS builder
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+RUN apk add --no-cache \
+  build-base \
+  cargo \
+  cmake \
+  eudev-dev \
+  linux-headers \
+  perl \
+  rust
+
+WORKDIR /parity
+COPY . /parity
+RUN cargo build --release --target x86_64-alpine-linux-musl --verbose
+RUN strip target/x86_64-alpine-linux-musl/release/parity
+
+
+FROM alpine:edge
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+RUN apk add --no-cache \
+  libstdc++ \
+  eudev-libs \
+  libgcc
+
+RUN addgroup -g 1000 parity \
+  && adduser -u 1000 -G parity -s /bin/sh -D parity
+
+USER parity
+
+EXPOSE 8080 8545 8180
+
+WORKDIR /home/parity
+
+RUN mkdir -p /home/parity/.local/share/io.parity.ethereum/
+COPY --chown=parity:parity --from=builder /parity/target/x86_64-alpine-linux-musl/release/parity ./
+
+ENTRYPOINT ["./parity"]

scripts/docker/centos/Dockerfile

@@ -0,0 +1,28 @@
+FROM centos:latest
+
+RUN mkdir -p /opt/parity/data && \
+    chmod g+rwX /opt/parity/data && \
+    mkdir -p /opt/parity/release
+
+COPY parity/parity /opt/parity/release
+
+WORKDIR /opt/parity/data
+
+# exposing default ports
+#
+#           secret
+#      ipfs store     ui   rpc  ws   listener  discovery
+#      ↓    ↓         ↓    ↓    ↓    ↓         ↓
+EXPOSE 5001 8082 8083 8180 8545 8546 30303/tcp 30303/udp
+
+# switch to non-root user
+USER 1001
+
+#if no base path provided, assume it's current workdir
+CMD ["--base-path","."]
+ENTRYPOINT ["/opt/parity/release/parity"]  
+
+
+   
+
+

scripts/docker/centos/Dockerfile.build

@@ -0,0 +1,25 @@
+FROM centos:latest
+
+WORKDIR /build
+
+ADD . /build/parity-ethereum
+
+RUN yum -y update && \
+    yum install -y systemd-devel git make gcc-c++ gcc file binutils && \
+    curl -L "https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.tar.gz" -o cmake.tar.gz && \
+    tar -xzf cmake.tar.gz && \
+    cp -r cmake-3.12.0-Linux-x86_64/* /usr/ && \
+    curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+    PATH=/root/.cargo/bin:$PATH && \
+    RUST_BACKTRACE=1 && \
+    rustc -vV && \
+    cargo -V && \
+    gcc -v && \
+    g++ -v && \
+    cmake --version && \
+    cd parity-ethereum && \
+    cargo build --verbose --release --features final && \
+    strip /build/parity-ethereum/target/release/parity && \
+    file /build/parity-ethereum/target/release/parity
+
+

scripts/docker/centos/build.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+
+# The image name
+PARITY_IMAGE_REPO=${PARITY_IMAGE_REPO:-parity/parity}
+# The tag to be used for builder image
+PARITY_BUILDER_IMAGE_TAG=${PARITY_BUILDER_IMAGE_TAG:-build}
+# The tag to be used for runner image
+PARITY_RUNNER_IMAGE_TAG=${PARITY_RUNNER_IMAGE_TAG:-latest}
+
+echo Building $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H")
+docker build --no-cache -t $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H") . -f docker/centos/Dockerfile.build
+
+echo Creating $PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H"), extracting binary
+docker create --name extract $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H") 
+mkdir docker/centos/parity
+docker cp extract:/build/parity-ethereum/target/release/parity docker/centos/parity
+
+echo Building $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG
+docker build --no-cache -t $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG docker/centos/ -f docker/centos/Dockerfile
+
+echo Cleaning up ...
+rm -rf docker/centos/parity
+docker rm -f extract
+docker rmi -f $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H")
+
+echo Echoing Parity version:
+docker run $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG --version
+
+echo Done.

scripts/docker/ubuntu-aarch64/Dockerfile

@@ -0,0 +1,45 @@
+FROM ubuntu:14.04
+WORKDIR /build
+
+# install tools and dependencies
+RUN apt-get -y update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
+        libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \
+        binutils-aarch64-linux-gnu cmake3 libudev-dev \
+        && \
+    apt-get clean
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+ENV RUST_TARGETS="aarch64-unknown-linux-gnu"
+
+# multirust add arm--linux-gnuabhf toolchain
+RUN rustup target add aarch64-unknown-linux-gnu
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && cargo -V
+
+# build parity
+ADD . /build/parity
+RUN cd parity && \
+        mkdir -p .cargo && \
+        echo '[target.aarch64-unknown-linux-gnu]\n\
+        linker = "aarch64-linux-gnu-gcc"\n'\
+        >>.cargo/config && \
+        cat .cargo/config && \
+        cargo build --target aarch64-unknown-linux-gnu --release --verbose && \
+        ls /build/parity/target/aarch64-unknown-linux-gnu/release/parity &&     \
+        /usr/bin/aarch64-linux-gnu-strip /build/parity/target/aarch64-unknown-linux-gnu/release/parity
+
+RUN file /build/parity/target/aarch64-unknown-linux-gnu/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/aarch64-unknown-linux-gnu/release/parity"]

scripts/docker/ubuntu-arm/Dockerfile

@@ -0,0 +1,45 @@
+FROM ubuntu:14.04
+WORKDIR /build
+
+# install tools and dependencies
+RUN apt-get -y update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
+        libc6-dev-armhf-cross wget file ca-certificates \
+        binutils-arm-linux-gnueabihf cmake3 libudev-dev \
+        && \
+    apt-get clean
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+ENV RUST_TARGETS="arm-unknown-linux-gnueabihf"
+
+# multirust add arm--linux-gnuabhf toolchain
+RUN rustup target add armv7-unknown-linux-gnueabihf
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && cargo -V
+
+# build parity
+ADD . /build/parity
+RUN cd parity && \
+        mkdir -p .cargo && \
+        echo '[target.armv7-unknown-linux-gnueabihf]\n\
+        linker = "arm-linux-gnueabihf-gcc"\n'\
+        >>.cargo/config && \
+        cat .cargo/config && \
+        cargo build --target armv7-unknown-linux-gnueabihf --release --verbose && \
+        ls /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity && \
+        /usr/bin/arm-linux-gnueabihf-strip /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
+
+RUN file /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/armv7-unknown-linux-gnueabihf/release/parity"]

scripts/gitlab/build-unix.sh

@@ -2,13 +2,19 @@
 
 set -e # fail on any error
 set -u # treat unset variables as error
+
 echo "__________Show ENVIROMENT__________"
-echo "CC:       " $CC
-echo "CXX:      " $CXX
+echo "CI_SERVER_NAME:   " $CI_SERVER_NAME
+echo "CARGO_HOME:       " $CARGO_HOME
+echo "BUILD_TARGET:     " $BUILD_TARGET
+echo "BUILD_ARCH:       " $BUILD_ARCH
+echo "CARGO_TARGET:     " $CARGO_TARGET
+echo "CC:               " $CC
+echo "CXX:              " $CXX
 
 echo "__________CARGO CONFIG__________"
-rm -rf .cargo
 mkdir -p .cargo
+rm -f .cargo/config
 echo "[target.$CARGO_TARGET]" >> .cargo/config
 echo "linker= \"$CC\"" >> .cargo/config
 cat .cargo/config

scripts/gitlab/build-windows.sh

@@ -6,18 +6,29 @@ set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs20
 set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64"
 
 rustup default stable-x86_64-pc-windows-msvc
-echo "_____ Building _____"
+
+echo "__________Show ENVIROMENT__________"
+echo "CI_SERVER_NAME:   " $CI_SERVER_NAME
+echo "CARGO_HOME:       " $CARGO_HOME
+echo "BUILD_TARGET:     " $BUILD_TARGET
+echo "BUILD_ARCH:       " $BUILD_ARCH
+echo "CARGO_TARGET:     " $CARGO_TARGET
+echo "CC:               " $CC
+echo "CXX:              " $CXX
+
+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 "__________Sign binaries__________"
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity-evm.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethstore.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethkey.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/whisper.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity-evm.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethstore.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethkey.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/whisper.exe
 
 echo "_____ Post-processing binaries _____"
 rm -rf artifacts
@@ -25,7 +36,11 @@ mkdir -p artifacts
 cd artifacts
 mkdir -p $CARGO_TARGET
 cd $CARGO_TARGET
-cp --verbose ../../target/$CARGO_TARGET/release/{parity.exe,parity-evm.exe,ethstore.exe,ethkey.exe,whisper.exe} .
+cp --verbose ../../target/$CARGO_TARGET/release/parity.exe ./parity.exe
+cp --verbose ../../target/$CARGO_TARGET/release/parity-evm.exe ./parity-evm.exe
+cp --verbose ../../target/$CARGO_TARGET/release/ethstore.exe ./ethstore.exe
+cp --verbose ../../target/$CARGO_TARGET/release/ethkey.exe ./ethkey.exe
+cp --verbose ../../target/$CARGO_TARGET/release/whisper.exe ./whisper.exe
 
 echo "_____ Calculating checksums _____"
 for binary in $(ls)

scripts/gitlab/publish-awss3.sh

@@ -19,24 +19,21 @@ echo ${filetest[*]}
 for DIR in "${filetest[@]}";
 do
   cd $DIR
-  if [[ $DIR == "*windows*" ]];
+  if [[ $DIR =~ "windows" ]];
     then
       WIN=".exe";
     else
       WIN="";
   fi
-  for binary in $(ls parity.sha3)
-  do
-    sha3=$(cat ${binary/sha3} | awk '{ print $1}' )
-    case $DIR in
-      x86_64* )
-        DATA="commit=$CI_BUILD_REF&sha3=$sha3&filename=parity$WIN&secret=$RELEASES_SECRET"
-        ../../scripts/gitlab/safe-curl.sh $DATA "http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$DIR"
-        # Kovan
-        ../../scripts/gitlab/safe-curl.sh $DATA "http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$DIR"
-        ;;
-    esac
-  done
+  sha3=$(cat parity.sha3 | awk '{print $1}')
+  case $DIR in
+    x86_64* )
+      DATA="commit=$CI_BUILD_REF&sha3=$sha3&filename=parity$WIN&secret=$RELEASES_SECRET"
+      ../../scripts/gitlab/safe-curl.sh $DATA "http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$DIR"
+      # Kovan
+      ../../scripts/gitlab/safe-curl.sh $DATA "http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$DIR"
+      ;;
+  esac
   cd ..
 done
 

scripts/gitlab/publish-docker.sh

@@ -17,6 +17,6 @@ export DOCKER_TARGET=$1
 echo $DOCKER_TARGET
 
 echo "__________Docker build and push__________"
-docker build --build-arg TARGET=$DOCKER_TARGET --no-cache=true --tag parity/$DOCKER_TARGET:$DOCKER_BUILD_TAG -f scripts/gitlab/hub-docker.file .
+docker build --build-arg TARGET=$DOCKER_TARGET --no-cache=true --tag parity/$DOCKER_TARGET:$DOCKER_BUILD_TAG -f scripts/docker/hub/Dockerfile .
 docker push parity/$DOCKER_TARGET:$DOCKER_BUILD_TAG
 docker logout