Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into piomiko/try-runtime…
Browse files Browse the repository at this point in the history
…/forward

# Conflicts:
#	bin/node-template/node/src/command.rs
#	bin/node-template/runtime/src/lib.rs
#	bin/node/runtime/src/lib.rs
#	frame/executive/src/lib.rs
#	frame/support/src/traits/hooks.rs
#	frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
#	frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
#	frame/try-runtime/src/lib.rs
#	utils/frame/remote-externalities/src/lib.rs
#	utils/frame/rpc/client/src/lib.rs
#	utils/frame/try-runtime/cli/Cargo.toml
#	utils/frame/try-runtime/cli/src/commands/create_snapshot.rs
#	utils/frame/try-runtime/cli/src/commands/execute_block.rs
#	utils/frame/try-runtime/cli/src/commands/follow_chain.rs
#	utils/frame/try-runtime/cli/src/commands/mod.rs
#	utils/frame/try-runtime/cli/src/commands/offchain_worker.rs
#	utils/frame/try-runtime/cli/src/commands/on_runtime_upgrade.rs
#	utils/frame/try-runtime/cli/src/lib.rs
  • Loading branch information
pmikolajczyk41 committed Dec 15, 2022
2 parents 51175d4 + cd2fdcf commit 853100c
Show file tree
Hide file tree
Showing 249 changed files with 7,522 additions and 2,349 deletions.
9 changes: 8 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,14 @@ default:
paths:
- artifacts/

.job-switcher:
before_script:
- if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi

.kubernetes-env:
image: "${CI_IMAGE}"
before_script:
- !reference [.job-switcher, before_script]
tags:
- kubernetes-parity-build

Expand All @@ -95,6 +101,7 @@ default:

.pipeline-stopper-vars:
script:
- !reference [.job-switcher, before_script]
- echo "Collecting env variables for the cancel-pipeline job"
- echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
Expand All @@ -110,6 +117,7 @@ default:
before_script:
# TODO: remove unset invocation when we'll be free from 'ENV RUSTC_WRAPPER=sccache' & sccache itself in all images
- unset RUSTC_WRAPPER
- !reference [.job-switcher, before_script]
- !reference [.rust-info-script, script]
- !reference [.rusty-cachier, before_script]
- !reference [.pipeline-stopper-vars, script]
Expand Down Expand Up @@ -300,7 +308,6 @@ rusty-cachier-notify:
PR_NUM: "${PR_NUM}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
branch: "as-improve"

remove-cancel-pipeline-message:
stage: .post
Expand Down
Loading

0 comments on commit 853100c

Please sign in to comment.