From c9cee8fd52533bc20dfbe0117b20e244bfd5f845 Mon Sep 17 00:00:00 2001 From: Afri Schoedon <5chdn@users.noreply.github.com> Date: Mon, 18 Jun 2018 11:49:15 +0200 Subject: [PATCH] Remove debian/.deb and centos/.rpm packaging scripts (#8887) * scripts: remove rpm packages * scripts: remove deb packages * scripts: remove unused zip archives * scripts: remove unused ssl references * scripts: remove debian and centos pipelines * scripts: rename ubuntu to generic linux * scripts: restore archives used in gitlab artifacts * scripts: init submodules for full test suite * scripts: do not publish master builds, only nightly, stable, beta --- .gitlab-ci.yml | 48 ++++------------------- scripts/deb-build.sh | 34 ---------------- scripts/gitlab-build.sh | 86 +---------------------------------------- test.sh | 1 + 4 files changed, 10 insertions(+), 159 deletions(-) delete mode 100755 scripts/deb-build.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4add4172..8f2304e5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,13 +7,12 @@ variables: RUSTFLAGS: "" CARGOFLAGS: "" CI_SERVER_NAME: "GitLab CI" - LIBSSL: "libssl1.0.0 (>=1.0.0)" cache: key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME" paths: - target/ untracked: true -linux-ubuntu: +linux-amd64: stage: build image: parity/rust:gitlab-ci only: @@ -24,46 +23,13 @@ linux-ubuntu: 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-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ linux 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 - only: - - beta - - tags - - stable - - triggers - 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 - 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 - 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 @@ -73,7 +39,7 @@ linux-i686: - stable - triggers script: - - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu + - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ linux tags: - rust-i686 artifacts: @@ -90,7 +56,7 @@ linux-armv7: - 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 + - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ linux tags: - rust-arm artifacts: @@ -98,7 +64,7 @@ linux-armv7: - parity.zip name: "armv7_unknown_linux_gnueabihf_parity" allow_failure: true -linux-arm: +linux-armhf: stage: build image: parity/rust-arm:gitlab-ci only: @@ -107,7 +73,7 @@ linux-arm: - 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 + - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ linux tags: - rust-arm artifacts: @@ -124,7 +90,7 @@ linux-aarch64: - 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 + - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ linux tags: - rust-arm artifacts: 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/gitlab-build.sh b/scripts/gitlab-build.sh index 08640e230..5e272f621 100755 --- a/scripts/gitlab-build.sh +++ b/scripts/gitlab-build.sh @@ -17,7 +17,6 @@ echo "Build identifier: " $IDENT echo "Cargo target: " $PLATFORM echo "CC&CXX flags: " $CC ", " $CXX echo "Architecture: " $ARC -echo "Libssl version: " $LIBSSL echo "Parity version: " $VER echo "Branch: " $CI_BUILD_REF_NAME echo "--------------------" @@ -87,56 +86,6 @@ calculate_checksums () { $SHA256_BIN target/$PLATFORM/release/ethkey$S3WIN > ethkey$S3WIN.sha256 $SHA256_BIN target/$PLATFORM/release/whisper$S3WIN > whisper$S3WIN.sha256 } -make_deb () { - rm -rf deb - echo "create DEBIAN files" - mkdir -p deb/usr/bin/ - mkdir -p deb/DEBIAN - echo "create copyright, docs, compat" - cp LICENSE deb/DEBIAN/copyright - echo "https://github.com/paritytech/parity/wiki" >> deb/DEBIAN/docs - echo "8" >> deb/DEBIAN/compat - echo "create control file" - control=deb/DEBIAN/control - echo "Package: parity" >> $control - echo "Version: $VER" >> $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: $ARC" >> $control - echo "Depends: $LIBSSL" >> $control - echo "Description: Ethereum network client by Parity Technologies" >> $control - size=`du deb/|awk 'END {print $1}'` - echo "Installed-Size: $size" >> $control - echo "build .deb package" - cp target/$PLATFORM/release/parity deb/usr/bin/parity - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey - cp target/$PLATFORM/release/whisper deb/usr/bin/whisper - dpkg-deb -b deb "parity_"$VER"_"$IDENT"_"$ARC".deb" - $SHA256_BIN "parity_"$VER"_"$IDENT"_"$ARC".deb" > "parity_"$VER"_"$IDENT"_"$ARC".deb.sha256" -} -make_rpm () { - rm -rf /install - mkdir -p /install/usr/bin - cp target/$PLATFORM/release/parity /install/usr/bin - cp target/$PLATFORM/release/parity-evm /install/usr/bin/parity-evm - cp target/$PLATFORM/release/ethstore /install/usr/bin/ethstore - cp target/$PLATFORM/release/ethkey /install/usr/bin/ethkey - cp target/$PLATFORM/release/whisper /install/usr/bin/whisper - - rm -rf "parity-"$VER"-1."$ARC".rpm" || true - fpm -s dir -t rpm -n parity -v $VER --epoch 1 --license GPLv3 -d openssl --provides parity --url https://parity.io --vendor "Parity Technologies" -a x86_64 -m "" --description "Ethereum network client by Parity Technologies" -C /install/ - cp "parity-"$VER"-1."$ARC".rpm" "parity_"$VER"_"$IDENT"_"$ARC".rpm" - $SHA256_BIN "parity_"$VER"_"$IDENT"_"$ARC".rpm" > "parity_"$VER"_"$IDENT"_"$ARC".rpm.sha256" -} sign_exe () { ./sign.cmd $keyfile $certpass "target/$PLATFORM/release/parity.exe" } @@ -144,7 +93,7 @@ push_binaries () { echo "Push binaries to AWS S3" aws configure set aws_access_key_id $s3_key aws configure set aws_secret_access_key $s3_secret - if [[ "$CI_BUILD_REF_NAME" = "master" || "$CI_BUILD_REF_NAME" = "beta" || "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "nightly" ]]; + if [[ "$CI_BUILD_REF_NAME" = "beta" || "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "nightly" ]]; then export S3_BUCKET=builds-parity-published; else @@ -162,6 +111,7 @@ push_binaries () { aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/whisper$S3WIN --body target/$PLATFORM/release/whisper$S3WIN aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/whisper$S3WIN.sha256 --body whisper$S3WIN.sha256 } + make_archive () { echo "add artifacts to archive" rm -rf parity.zip @@ -183,78 +133,46 @@ case $BUILD_PLATFORM in #set strip bin STRIP_BIN="strip" #package extention - EXT="deb" build strip_binaries calculate_checksums - make_deb make_archive push_binaries updater_push_release ;; - x86_64-unknown-debian-gnu) - STRIP_BIN="strip" - EXT="deb" - LIBSSL="libssl1.1 (>=1.1.0)" - echo "Use libssl1.1 (>=1.1.0) for Debian builds" - build - strip_binaries - calculate_checksums - make_deb - make_archive - push_binaries - ;; - x86_64-unknown-centos-gnu) - STRIP_BIN="strip" - EXT="rpm" - build - strip_binaries - calculate_checksums - make_rpm - make_archive - push_binaries - ;; i686-unknown-linux-gnu) STRIP_BIN="strip" - EXT="deb" set_env build strip_binaries calculate_checksums - make_deb make_archive push_binaries ;; armv7-unknown-linux-gnueabihf) STRIP_BIN="arm-linux-gnueabihf-strip" - EXT="deb" set_env build strip_binaries calculate_checksums - make_deb make_archive push_binaries ;; arm-unknown-linux-gnueabihf) STRIP_BIN="arm-linux-gnueabihf-strip" - EXT="deb" set_env build strip_binaries calculate_checksums - make_deb make_archive push_binaries ;; aarch64-unknown-linux-gnu) STRIP_BIN="aarch64-linux-gnu-strip" - EXT="deb" set_env build strip_binaries calculate_checksums - make_deb make_archive push_binaries ;; diff --git a/test.sh b/test.sh index 9bb527b70..9e273c749 100755 --- a/test.sh +++ b/test.sh @@ -56,4 +56,5 @@ cd parity-clib-example && \ # Running tests echo "________Running Parity Full Test Suite________" +git submodule update --init --recursive cargo test -j 8 $OPTIONS --features "$FEATURES" --all $1