From e968b4a8a4fb8990542b2a60182367cf2a3fa2d2 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Tue, 20 Sep 2022 10:33:13 +0200 Subject: [PATCH 1/3] [WIP][ci] Disable auto-fmt and revert cancel-pipeline --- .gitlab-ci.yml | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 501a71f6ff9..2f899e378a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,23 +112,6 @@ variables: tags: - kubernetes-parity-build -#### stage: .pre - -# checks code format and fails if formatting is required -# the code will be formatted automatically and the pipeline will be restarted -cargo-fmt: - stage: .pre - <<: *pr-refs - <<: *kubernetes-env - before_script: - - echo PROJECT_NAME=$CI_PROJECT_NAME > fmt.env - - echo PR_BRANCH_NAME=$(curl -s https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls/${CI_COMMIT_REF_NAME} | jq -r ".head.ref") >> fmt.env - script: - - cargo +nightly fmt --check - artifacts: - reports: - dotenv: fmt.env - #### stage: test test-linux-stable: @@ -686,19 +669,5 @@ cancel-pipeline: PR_NUM: "${PR_NUM}" trigger: project: "parity/infrastructure/ci_cd/pipeline-stopper" - # remove branch, when pipeline-stopper for substrate and polakdot is updated to the same branch - branch: "as-improve" -# this job will automatically format code and rerun pipeline if cargo-fmt job fails -auto-fmt: - stage: .post - rules: - - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - when: on_failure - needs: - - job: cargo-fmt - variables: - PROJECT_NAME: "${CI_PROJECT_NAME}" - PR_BRANCH_NAME: "${PR_BRANCH_NAME}" - trigger: - project: "parity/infrastructure/ci_cd/auto-fmt" + From 4ac9af82fec19c0aeee1efc5993551bee5cd2812 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Tue, 20 Sep 2022 10:39:05 +0200 Subject: [PATCH 2/3] fail test-linux-stable --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f899e378a9..c31d17bca3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,6 +127,7 @@ test-linux-stable: # but still want to have debug assertions. RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings" script: + - exit 1 - time cargo nextest run --all --release --locked --run-ignored all test-doc: From e6cb6bdea2cefc9d00becf95d4d134d1d701a2fd Mon Sep 17 00:00:00 2001 From: alvicsam Date: Tue, 20 Sep 2022 10:41:33 +0200 Subject: [PATCH 3/3] fix test-linux-stable --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c31d17bca3e..2f899e378a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,6 @@ test-linux-stable: # but still want to have debug assertions. RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings" script: - - exit 1 - time cargo nextest run --all --release --locked --run-ignored all test-doc: