From 863a70b8fcf0e8af4093d4a1a7e742a8686702e4 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 13 Nov 2019 00:02:41 +0100 Subject: [PATCH] new clean try to get circle-ci to work, disable and move gh actions to ci_scripts folder --- .../gh-actions-rust.yml | 31 +++++++++---------- ci_scripts/run-rust-test.sh | 4 +-- 2 files changed, 17 insertions(+), 18 deletions(-) rename .github/workflows/rust.yml => ci_scripts/gh-actions-rust.yml (78%) diff --git a/.github/workflows/rust.yml b/ci_scripts/gh-actions-rust.yml similarity index 78% rename from .github/workflows/rust.yml rename to ci_scripts/gh-actions-rust.yml index 730d33584..c5fb79092 100644 --- a/.github/workflows/rust.yml +++ b/ci_scripts/gh-actions-rust.yml @@ -60,19 +60,18 @@ jobs: - name: fmt run: cargo fmt --all -- --check - clippy_check: - name: Clippy check - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - components: clippy - - - name: clippy - run: cargo clippy --all +# clippy_check: +# name: Clippy check +# runs-on: ubuntu-latest +# +# steps: +# - uses: actions/checkout@v1 +# - uses: actions-rs/toolchain@v1 +# with: +# profile: minimal +# toolchain: nightly +# override: true +# components: clippy +# +# - name: clippy +# run: cargo clippy --all diff --git a/ci_scripts/run-rust-test.sh b/ci_scripts/run-rust-test.sh index 5a8e20c7d..8050ebcba 100755 --- a/ci_scripts/run-rust-test.sh +++ b/ci_scripts/run-rust-test.sh @@ -32,8 +32,8 @@ if [[ $NORUN == "1" ]]; then export CARGO_SUBCMD="build" else export CARGO_SUBCMD="test --all" - export OPT="${OPT} " - export OPT_RELEASE="${OPT_RELEASE} " + export OPT="-j1 ${OPT} " + export OPT_RELEASE="-j2 ${OPT_RELEASE} " export OPT_RELEASE_IGNORED="${OPT_RELEASE} -- --ignored" fi