diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c615be99c..f3708fb9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,263 +1,364 @@ stages: - test - - push-release - build + - package + - publish + - push-release + +image: parity/rust:gitlab-ci + variables: - RUST_BACKTRACE: "1" - RUSTFLAGS: "" - CARGOFLAGS: "" - CI_SERVER_NAME: "GitLab CI" - LIBSSL: "libssl1.0.0 (>=1.0.0)" + CI_SERVER_NAME: "GitLab CI" + CARGO_HOME: "${CI_PROJECT_DIR}/cargo" + + BUILD_TARGET: ubuntu + BUILD_ARCH: amd64 + CARGO_TARGET: x86_64-unknown-linux-gnu + LIBSSL: "libssl1.0.0 (>=1.0.0)" + cache: - key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME" + key: "${CI_JOB_NAME}" paths: - - target/ - untracked: true -linux-ubuntu: - stage: build - image: parity/rust:gitlab-ci - only: + - ${CI_PROJECT_DIR}/target/ + - ${CI_PROJECT_DIR}/cargo/ + +.releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries") + only: &releaseable_branches + - master + - stable - beta - tags - - stable + - nightly - triggers + +.publishable_branches: # list of git refs for publishing builds to the "production" locations + only: &publishable_branches + - nightly # Our nightly builds from schedule, on `master` + - "v*" # Our version tags + - triggers + +.collect_artifacts: &collect_artifacts + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + when: on_success + expire_in: 1 mos + paths: + - artifacts/ + +.collect_packages: &collect_packages + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + when: on_success + expire_in: 1 mos + paths: + - packages/ + +.determine_version: &determine_version | + export VERSION=$(grep -m 1 "version =" Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n") + echo "Version" $VERSION + + +#### stage: test + +test:rust:stable: &test + stage: test script: - - rustup default stable - # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier - - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ ubuntu + - scripts/gitlab/test.sh stable tags: - rust-stable - artifacts: - paths: - - parity.zip - name: "stable-x86_64-unknown-linux-gnu_parity" -linux-debian: - stage: build - image: parity/rust-debian:gitlab-ci + +.optional_test: &optional_test + <<: *test + allow_failure: true only: - - beta - - tags - - stable - triggers + - master + - nightly + +test:rust:beta: + <<: *optional_test script: - - export LIBSSL="libssl1.1 (>=1.1.0)" - - scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++ debian + - scripts/gitlab/test.sh beta + allow_failure: true + +test:rust:nightly: + <<: *optional_test + script: + - scripts/gitlab/test.sh nightly + allow_failure: true + +#test:rustfmt: +# <<: *optional_test +# script: +# - scripts/gitlab/rustfmt.sh + +#test:clippy: +# <<: *optional_test +# script: +# - scripts/gitlab/clippy.sh + +test:coverage: + stage: test + only: + - master + - gitlab-next + script: + - scripts/gitlab/coverage.sh tags: - - rust-debian - artifacts: - paths: - - parity.zip - name: "stable-x86_64-unknown-debian-gnu_parity" -linux-centos: - stage: build - image: parity/rust-centos:gitlab-ci - only: - - beta - - tags - - stable - - triggers + - shell + allow_failure: true + + +#### stage: build + +build:linux:ubuntu:amd64: &build + stage: build + only: *releaseable_branches + variables: + CARGO_TARGET: x86_64-unknown-linux-gnu script: - - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++ centos - tags: - - rust-centos - artifacts: - paths: - - parity.zip - name: "x86_64-unknown-centos-gnu_parity" -linux-i686: - stage: build - image: parity/rust-i686:gitlab-ci - only: - - beta - - tags - - stable - - triggers - script: - - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu - tags: - - rust-i686 - artifacts: - paths: - - parity.zip - name: "i686-unknown-linux-gnu" - allow_failure: true -linux-armv7: - stage: build - image: parity/rust-armv7:gitlab-ci - only: - - beta - - tags - - stable - - triggers - script: - - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu - tags: - - rust-arm - artifacts: - paths: - - parity.zip - name: "armv7_unknown_linux_gnueabihf_parity" - allow_failure: true -linux-arm: - stage: build - image: parity/rust-arm:gitlab-ci - only: - - beta - - tags - - stable - - triggers - script: - - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu - tags: - - rust-arm - artifacts: - paths: - - parity.zip - name: "arm-unknown-linux-gnueabihf_parity" - allow_failure: true -linux-aarch64: - stage: build - image: parity/rust-arm64:gitlab-ci - only: - - beta - - tags - - stable - - triggers - script: - - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ ubuntu - tags: - - rust-arm - artifacts: - paths: - - parity.zip - name: "aarch64-unknown-linux-gnu_parity" -linux-snap: - stage: build - image: parity/snapcraft:gitlab-ci - only: - - stable - - beta - - tags - - triggers - script: - - scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++ snap + - scripts/gitlab/build-unix.sh + <<: *collect_artifacts tags: - rust-stable - artifacts: - paths: - - parity.zip - name: "stable-x86_64-unknown-snap-gnu_parity" -darwin: - stage: build - only: - - beta - - tags - - stable - - triggers - script: - - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos + +build:linux:debian:amd64: + <<: *build + image: parity/rust-debian:gitlab-ci + variables: + LIBSSL: "libssl1.1 (>=1.1.0)" + CARGO_TARGET: x86_64-unknown-linux-gnu + +build:linux:centos:x86_64: + <<: *build + image: parity/rust-centos:gitlab-ci + retry: 2 #if version `GLIBC_2.18' not found + +build:linux:ubuntu:arm64: + <<: *build + image: parity/rust-arm64:gitlab-ci + variables: + CARGO_TARGET: aarch64-unknown-linux-gnu + +build:linux:ubuntu:armhf: + <<: *build + image: parity/rust-armv7:gitlab-ci + variables: + CARGO_TARGET: armv7-unknown-linux-gnueabihf + +build:linux:android:armhf: + <<: *build + image: parity/rust-android:gitlab-ci + variables: + CARGO_TARGET: armv7-linux-androideabi + +build:macos:x86_64: + <<: *build + variables: + CARGO_TARGET: x86_64-apple-darwin tags: - osx - artifacts: - paths: - - parity.zip - name: "x86_64-apple-darwin_parity" -windows: + <<: *collect_artifacts + +build-windows-x86_64: + stage: build + only: *releaseable_branches cache: - key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%" - untracked: true - stage: build - only: - - beta - - tags - - stable - - triggers + key: "%CI_JOB_NAME%" + paths: + - "%CI_PROJECT_DIR%/target/" + - "%CI_PROJECT_DIR%/cargo/" + variables: + CARGO_TARGET: x86_64-pc-windows-msvc script: - - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows + - sh scripts/gitlab/build-windows.sh tags: - rust-windows - artifacts: - paths: - - parity.zip - name: "x86_64-pc-windows-msvc_parity" -android-armv7: - stage: build - image: parity/parity-android:latest - only: - - beta - - tags - - stable - - triggers - script: - - cargo build --target=armv7-linux-androideabi - tags: - - rust-arm - allow_failure: true - artifacts: - paths: - - parity.zip - name: "armv7-linux-androideabi_parity" -docker-build: - stage: build - only: - - tags - - triggers + <<: *collect_artifacts + + +#### stage: package + +package:ubuntu:deb:amd64: &package_unix + stage: package + only: *releaseable_branches before_script: - - docker info + - *determine_version + variables: + BUILD_ARCH: amd64 + IDENT: ubuntu + PKG: deb + LIBSSL: "libssl1.1 (>=1.1.0)" + dependencies: + - build:linux:ubuntu:amd64 script: - - if [ "$CI_BUILD_REF_NAME" == "master" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi - - echo "Tag:" $DOCKER_TAG - - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity - - scripts/docker-build.sh $DOCKER_TAG - - docker logout - tags: - - docker -test-coverage: - stage: test - only: - - master - script: - - scripts/gitlab-test.sh test-coverage - tags: - - kcov - allow_failure: true -test-rust-stable: - stage: test - image: parity/rust:gitlab-ci - script: - - scripts/gitlab-test.sh stable + - scripts/gitlab/package-unix.sh tags: - rust-stable -test-rust-beta: - stage: test - only: - - triggers - - master - image: parity/rust:gitlab-ci + <<: *collect_packages + +package:ubuntu:deb:arm64: + <<: *package_unix + variables: + BUILD_ARCH: arm64 + IDENT: ubuntu + PKG: deb + dependencies: + - build:linux:ubuntu:arm64 + +package:ubuntu:deb:armhf: + <<: *package_unix + variables: + BUILD_ARCH: armhf + IDENT: ubuntu + PKG: deb + dependencies: + - build:linux:ubuntu:armhf + +package:debian:deb:amd64: + <<: *package_unix + variables: + BUILD_ARCH: amd64 + IDENT: debian + PKG: deb + dependencies: + - build:linux:debian:amd64 + +package:centos:rpm:x86_64: + <<: *package_unix + variables: + BUILD_ARCH: x86_64 + IDENT: centos + PKG: rpm + LIBSSL: "libssl >= 1.0.0" + dependencies: + - build:linux:centos:x86_64 + + +package:macos:pkg:x86_64: + <<: *package_unix + dependencies: + - build:macos:x86_64 script: - - scripts/gitlab-test.sh beta + - scripts/gitlab/package-macos.sh tags: - - rust-beta - allow_failure: true -test-rust-nightly: - stage: test - only: - - triggers - - master - image: parity/rust:gitlab-ci + - osx + +package:linux:snap:amd64: &package_snap + stage: package + only: *releaseable_branches + before_script: + - *determine_version + dependencies: + - build:linux:ubuntu:amd64 script: - - scripts/gitlab-test.sh nightly + - scripts/gitlab/package-snap.sh tags: - - rust - - rust-nightly - allow_failure: true -push-release: + - rust-stable + <<: *collect_packages + +package:linux:snap:arm64: + <<: *package_snap + variables: + BUILD_ARCH: arm64 + dependencies: + - build:linux:ubuntu:arm64 + +package:linux:snap:armhf: + <<: *package_snap + variables: + BUILD_ARCH: armhf + dependencies: + - build:linux:ubuntu:armhf + +package-windows-exe-x86_64: + stage: package + only: *releaseable_branches + dependencies: + - build-windows-x86_64 + script: + - sh scripts/gitlab/package-windows.sh + <<: *collect_packages + tags: + - rust-windows + +#### stage: publish + +publish:linux:snap:amd64: &publish_snap + stage: publish + only: *publishable_branches + image: snapcore/snapcraft:stable + before_script: + - *determine_version + variables: + BUILD_ARCH: amd64 + dependencies: + - package:linux:snap:amd64 + script: + - scripts/gitlab/publish-snap.sh + tags: + - rust-stable + +publish:linux:snap:arm64: + <<: *publish_snap + before_script: + - *determine_version + - sleep 120 + variables: + BUILD_ARCH: arm64 + dependencies: + - package:linux:snap:arm64 + +publish:linux:snap:armhf: + <<: *publish_snap + before_script: + - *determine_version + - sleep 360 + variables: + BUILD_ARCH: armhf + dependencies: + - package:linux:snap:armhf + +publish:docker:parity:amd64: &publish_docker + stage: publish + only: *publishable_branches + dependencies: + - build:linux:ubuntu:amd64 + tags: + - shell + script: + - scripts/gitlab/publish-docker.sh parity + +publish:docker:parity-evm:amd64: + <<: *publish_docker + script: + - scripts/gitlab/publish-docker.sh parity-evm + +publish:github: + stage: publish + only: *publishable_branches + dependencies: + - package:ubuntu:deb:amd64 + - package:ubuntu:deb:armhf + - package:ubuntu:deb:arm64 + - package:debian:deb:amd64 + - package:centos:rpm:x86_64 + - package:macos:pkg:x86_64 + - package-windows-exe-x86_64 + before_script: + - *determine_version + script: + - scripts/gitlab/push-github.sh + +#### stage: push-release + +push:release: stage: push-release only: - tags - triggers image: parity/rust:gitlab-ci script: - - scripts/gitlab-push-release.sh + - scripts/gitlab/push-release.sh tags: - curl diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile index 71655036e..a0921ae4b 100644 --- a/docker/hub/Dockerfile +++ b/docker/hub/Dockerfile @@ -1,66 +1,27 @@ -FROM ubuntu:14.04 +FROM ubuntu:xenial MAINTAINER Parity Technologies -WORKDIR /build -#ENV for build TAG -ARG BUILD_TAG -ENV BUILD_TAG ${BUILD_TAG:-master} -RUN echo "Build tag:" $BUILD_TAG +#set ENVIROMENT +ARG TARGET +ENV TARGET ${TARGET} + # install tools and dependencies -RUN apt-get update && \ - apt-get install -y --force-yes --no-install-recommends \ - # make - build-essential \ - # add-apt-repository - software-properties-common \ - make \ - curl \ - wget \ - git \ - g++ \ - gcc \ - libc6 \ - libc6-dev \ - binutils \ - file \ - openssl \ - libssl-dev \ - libudev-dev \ - pkg-config \ - dpkg-dev \ - libudev-dev &&\ -# install rustup - curl https://sh.rustup.rs -sSf | sh -s -- -y && \ -# rustup directory - PATH=/root/.cargo/bin:$PATH && \ +RUN apt update && apt install -y --no-install-recommends openssl libudev-dev file + # show backtraces - RUST_BACKTRACE=1 && \ -# build parity -cd /build&&git clone https://github.com/paritytech/parity && \ - cd parity && \ - git pull&& \ - git checkout $BUILD_TAG && \ - cargo build --verbose --release --features final && \ - #ls /build/parity/target/release/parity && \ - strip /build/parity/target/release/parity && \ - file /build/parity/target/release/parity&&mkdir -p /parity&& cp /build/parity/target/release/parity /parity&&\ +ENV RUST_BACKTRACE 1 + #cleanup Docker image - rm -rf /root/.cargo&&rm -rf /root/.multirust&&rm -rf /root/.rustup&&rm -rf /build&&\ - apt-get purge -y \ - # make - build-essential \ - # add-apt-repository - software-properties-common \ - make \ - curl \ - wget \ - git \ - g++ \ - gcc \ - binutils \ - file \ - pkg-config \ - dpkg-dev &&\ - rm -rf /var/lib/apt/lists/* +RUN apt autoremove -y +RUN apt clean -y +RUN rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* + +#add TARGET to docker image +COPY artifacts/$TARGET /usr/bin/$TARGET + +# Build a shell script because the ENTRYPOINT command doesn't like using ENV +RUN echo "#!/bin/bash \n ${TARGET} \$@" > ./entrypoint.sh +RUN chmod +x ./entrypoint.sh + # setup ENTRYPOINT EXPOSE 8080 8545 8180 -ENTRYPOINT ["/parity/parity"] +ENTRYPOINT ["./entrypoint.sh"] diff --git a/ethcore/res/wasm-tests b/ethcore/res/wasm-tests index fb111c82d..d9d6133c1 160000 --- a/ethcore/res/wasm-tests +++ b/ethcore/res/wasm-tests @@ -1 +1 @@ -Subproject commit fb111c82deff8759f54a5038d07cecc77cb5a663 +Subproject commit d9d6133c1bc5dca4c74c9eb758a39546a0d46b45 diff --git a/mac/Parity Ethereum.xcodeproj/project.pbxproj b/mac/Parity Ethereum.xcodeproj/project.pbxproj index 2e41be637..80bc86af8 100644 --- a/mac/Parity Ethereum.xcodeproj/project.pbxproj +++ b/mac/Parity Ethereum.xcodeproj/project.pbxproj @@ -34,16 +34,16 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0A7A475C1E3D2CDD0093D1AB /* parity */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = parity; path = ../target/release/parity; sourceTree = ""; }; + 0A7A475C1E3D2CDD0093D1AB /* parity */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = parity; path = ../artifacts/parity; sourceTree = ""; }; 0ACF9ABE1E30FAB600D5C935 /* Parity Ethereum.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Parity Ethereum.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 0ACF9AC11E30FAB600D5C935 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 0ACF9AC31E30FAB600D5C935 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 0ACF9AC61E30FAB600D5C935 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 0ACF9AC81E30FAB600D5C935 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GetBSDProcessList.swift; sourceTree = ""; }; - 0AED4D9F1E3E22F800BF87C0 /* ethstore */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethstore; path = ../target/release/ethstore; sourceTree = ""; }; - 84CF92B2200E559900AD6E78 /* parity-evm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "parity-evm"; path = "../target/release/parity-evm"; sourceTree = ""; }; - 84CF92B5200E56AE00AD6E78 /* ethkey */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethkey; path = ../target/release/ethkey; sourceTree = ""; }; + 0AED4D9F1E3E22F800BF87C0 /* ethstore */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethstore; path = ../artifacts/ethstore; sourceTree = ""; }; + 84CF92B2200E559900AD6E78 /* parity-evm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "parity-evm"; path = "../artifacts/parity-evm"; sourceTree = ""; }; + 84CF92B5200E56AE00AD6E78 /* ethkey */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethkey; path = ../artifacts/ethkey; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj index 36b8921ee..1d12f5fd6 100755 --- a/mac/Parity.pkgproj +++ b/mac/Parity.pkgproj @@ -626,7 +626,7 @@ BUILD_PATH PATH - ../target/release + .. PATH_TYPE 1 diff --git a/nsis/installer.nsi b/nsis/installer.nsi index c1f403331..e932d53b0 100644 --- a/nsis/installer.nsi +++ b/nsis/installer.nsi @@ -88,10 +88,10 @@ section "install" !insertmacro TerminateApp # Files added here should be removed by the uninstaller (see section "uninstall") - file /oname=parity.exe ..\target\x86_64-pc-windows-msvc\release\parity.exe - file /oname=parity-evm.exe ..\target\x86_64-pc-windows-msvc\release\parity-evm.exe - file /oname=ethstore.exe ..\target\x86_64-pc-windows-msvc\release\ethstore.exe - file /oname=ethkey.exe ..\target\x86_64-pc-windows-msvc\release\ethkey.exe + file /oname=parity.exe ..\artifacts\parity.exe + file /oname=parity-evm.exe ..\artifacts\parity-evm.exe + file /oname=ethstore.exe ..\artifacts\ethstore.exe + file /oname=ethkey.exe ..\artifacts\ethkey.exe file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe file "logo.ico" diff --git a/scripts/deb-build.sh b/scripts/deb-build.sh deleted file mode 100755 index 5682e2c29..000000000 --- a/scripts/deb-build.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -set -e # fail on any error -set -u # treat unset variables as error -rm -rf deb -#create DEBIAN files -mkdir -p deb/usr/bin/ -mkdir -p deb/DEBIAN -#create copyright, docs, compat -cp LICENSE deb/DEBIAN/copyright -echo "https://github.com/paritytech/parity/wiki" >> deb/DEBIAN/docs -echo "8" >> deb/DEBIAN/compat -#create control file -control=deb/DEBIAN/control -echo "Package: parity" >> $control -version=`grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n"` -echo "Version: $version" >> $control -echo "Source: parity" >> $control -echo "Section: science" >> $control -echo "Priority: extra" >> $control -echo "Maintainer: Parity Technologies " >> $control -echo "Build-Depends: debhelper (>=9)" >> $control -echo "Standards-Version: 3.9.5" >> $control -echo "Homepage: https://parity.io" >> $control -echo "Vcs-Git: git://github.com/paritytech/parity.git" >> $control -echo "Vcs-Browser: https://github.com/paritytech/parity" >> $control -echo "Architecture: $1" >> $control -echo "Depends: libssl1.0.0 (>=1.0.0)" >> $control -echo "Description: Ethereum network client by Parity Technologies" >> $control -size=`du deb/|awk 'END {print $1}'` -echo "Installed-Size: $size" >> $control -#build .deb package - -exit diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh deleted file mode 100755 index ceb085f51..000000000 --- a/scripts/docker-build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -cd docker/hub -DOCKER_BUILD_TAG=$1 -echo "Docker build tag: " $DOCKER_BUILD_TAG -docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG . -docker run -it parity/parity:$DOCKER_BUILD_TAG -v -docker push parity/parity:$DOCKER_BUILD_TAG diff --git a/scripts/gitlab-test.sh b/scripts/gitlab-test.sh deleted file mode 100755 index 57cf7c6b6..000000000 --- a/scripts/gitlab-test.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -#ARGUMENT test for RUST and COVERAGE -set -e # fail on any error -set -u # treat unset variables as error -if [[ "$CI_COMMIT_REF_NAME" = "master" || "$CI_COMMIT_REF_NAME" = "beta" || "$CI_COMMIT_REF_NAME" = "stable" ]]; then - export GIT_COMPARE=$CI_COMMIT_REF_NAME~; -else - export GIT_COMPARE=master; -fi -git fetch -a -export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -v -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e ^mac/ -e ^nsis/ -e ^docs/ | wc -l)" -echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED" -TEST_SWITCH=$1 -rust_test () { - git submodule update --init --recursive - rustup show - if [[ "${RUST_FILES_MODIFIED}" == "0" ]]; - then echo "Skipping Rust tests since no Rust files modified."; - else ./test.sh || exit $?; - fi - # if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]]; - # ### @TODO re-enable fail after https://github.com/paritytech/parity-import-tests/issues/3 - # then sh scripts/aura-test.sh; # || exit $?; - # fi -} -coverage_test () { - git submodule update --init --recursive - rm -rf target/* - scripts/cov.sh -} -case $TEST_SWITCH in - stable ) - rustup default stable - rust_test - ;; - beta) - rustup default beta - rust_test - ;; - nightly) - rustup default nightly - rust_test - ;; - test-coverage) - coverage_test - ;; -esac diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml deleted file mode 100644 index c0ca5507b..000000000 --- a/snap/snapcraft.yaml +++ /dev/null @@ -1,39 +0,0 @@ -name: parity -version: git -summary: Fast, light, robust Ethereum implementation -description: | - Parity's goal is to be the fastest, lightest, and most secure Ethereum - client. We are developing Parity using the sophisticated and cutting-edge - Rust programming language. Parity is licensed under the GPLv3, and can be - used for all your Ethereum needs. - -grade: devel -confinement: strict - -apps: - parity: - command: parity - plugs: [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland] - desktop: usr/share/applications/parity.desktop - -icon: snap/gui/icon.png - -parts: - desktop-icon: - source: ./snap - plugin: nil - prepare: | - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps - cp -v gui/parity.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ - cp -v gui/icon.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/ - parity: - source: . - plugin: rust - build-attributes: [no-system-libraries] - build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config] - stage-packages: [libc6, libssl1.0.0, libudev1, libstdc++6] - df: - plugin: nil - stage-packages: [coreutils] - stage: [bin/df]