CI optimizations

.gitlab-ci.yml

@@ -7,6 +7,8 @@ stages:
 image:                             parity/rust:gitlab-ci
 
 variables:
+  GIT_STRATEGY:                    fetch
+  GIT_SUBMODULE_STRATEGY:          recursive
   CI_SERVER_NAME:                  "GitLab CI"
   CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
@@ -40,14 +42,16 @@ test-linux:
   variables:
     RUN_TESTS:                     all
   script:
-    - scripts/gitlab/test-all.sh stable
+    - scripts/gitlab/test-all.sh
   tags:
     - rust-stable
 
 test-audit:
   stage:                           test
   script:
-    - scripts/gitlab/cargo-audit.sh
+    - set -e
+    - set -u
+    - cargo audit
   tags:
     - rust-stable
 
@@ -150,22 +154,3 @@ build-android:
   allow_failure:                   true
   <<:                              *collect_artifacts
 
-test-beta:
-  stage:                           optional
-  variables:
-    RUN_TESTS:                     cargo
-  script:
-    - scripts/gitlab/test-all.sh beta
-  tags:
-    - rust-beta
-  allow_failure:                   true
-
-test-nightly:
-  stage:                           optional
-  variables:
-    RUN_TESTS:                     all
-  script:
-    - scripts/gitlab/test-all.sh nightly
-  tags:
-    - rust-nightly
-  allow_failure:                   true

scripts/gitlab/build-unix.sh

@@ -27,20 +27,18 @@ fi
 
 echo "_____ Post-processing binaries _____"
 rm -rf artifacts
-mkdir -p artifacts
-cd artifacts
-mkdir -p $CARGO_TARGET
-cd $CARGO_TARGET
+mkdir -p artifacts/$CARGO_TARGET
+
 if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ]
 then
 # only thing we need for android
- cp -v ../../target/$CARGO_TARGET/release/libparity.so ./libparity.so
+  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
- cp -v ../../target/$CARGO_TARGET/release/ethstore ./ethstore
- cp -v ../../target/$CARGO_TARGET/release/ethkey ./ethkey
- cp -v ../../target/$CARGO_TARGET/release/whisper ./whisper
+  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
 
 echo "_____ Calculating checksums _____"

scripts/gitlab/test-all.sh

@@ -1,34 +1,11 @@
 #!/bin/bash
-# ARGUMENT $1 Rust flavor to test with (stable/beta/nightly)
 
 set -e # fail on any error
 set -u # treat unset variables as error
 
 git log --graph --oneline --decorate=short -n 10
 
-case ${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}} in
-  (beta|stable)
-    export GIT_COMPARE=origin/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}~
-    ;;
-  (master|nightly)
-    export GIT_COMPARE=master~
-    ;;
-  (*)
-    export GIT_COMPARE=master
-    ;;
-esac
-
-export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -v -e ^\\. -e ^LICENSE -e ^README.md -e ^CHANGELOG.md -e ^test.sh -e ^scripts/ -e ^docs/ -e ^docker/ -e ^snap/ | wc -l | tr -d ' ')"
-echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
-
-if [ "${RUST_FILES_MODIFIED}" = "0" ]
-then
-  echo "__________Skipping Rust tests since no Rust files modified__________";
-  exit 0
-fi
-
-rustup default $1
-
+# FIXME:
 git submodule update --init --recursive
 rustup show
 

test.sh

@@ -1,33 +1,12 @@
 #!/bin/sh
 # Running Parity Full Test Suite
+echo "________Running test.sh________"
 
 FEATURES="json-tests,ci-skip-issue"
 OPTIONS="--release"
 VALIDATE=1
 THREADS=8
 
-case $1 in
-  --no-json)
-    FEATURES="ipc"
-    shift # past argument=value
-    ;;
-  --no-release)
-    OPTIONS=""
-    shift
-    ;;
-  --no-validate)
-    VALIDATE=0
-    shift
-    ;;
-  --no-run)
-    OPTIONS="--no-run"
-    shift
-    ;;
-  *)
-    # unknown option
-    ;;
-esac
-
 set -e