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

Commit

Permalink
Merge branch 'master' into ao-erasure-coding-benches
Browse files Browse the repository at this point in the history
* master: (82 commits)
  Update dispute participation on active leaves update (#6303)
  Update disputes subsytems section. (#6329)
  Runtime diagnostics for leaked messages in unbounded channels (part 2) (#6481)
  Added comment describing satisfied invariant (#6460)
  [Companion] Allow StakingAdmin to set min_commission (#6444)
  Bump secp256k1 from 0.24.0 to 0.24.2 (#6411)
  Fix runtime-migration label detection (#6469)
  fix dependabot labels (#6468)
  cargo update -p libp2p-yamux (#6464)
  BlockId removal: refactor: HeaderBackend::status (#6459)
  Kusama origins as xcm multi_location (#6273)
  [ci] New try-runtime command (#6445)
  PVF preparation: do not conflate errors (#6384)
  BlockId removal: refactor: HeaderBackend::header (#6418)
  Update Substrate (#6457)
  Use explicit call indices (#6449)
  [bump] orchestra v0.0.4 (#6413)
  Adding some more logs (#6455)
  Make sure errors get logged (#6451)
  Fix wrong rate limit + add a few logs. (#6440)
  ...
  • Loading branch information
ordian committed Jan 2, 2023
2 parents 9672254 + db498ce commit ec8ffc2
Show file tree
Hide file tree
Showing 449 changed files with 10,844 additions and 7,775 deletions.
32 changes: 32 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# An auto defined `clippy` feature was introduced,
# but it was found to clash with user defined features,
# so was renamed to `cargo-clippy`.
#
# If you want standard clippy run:
# RUSTFLAGS= cargo clippy
[target.'cfg(feature = "cargo-clippy")']
rustflags = [
"-Aclippy::all",
"-Dclippy::correctness",
"-Aclippy::if-same-then-else",
"-Aclippy::clone-double-ref",
"-Dclippy::complexity",
"-Aclippy::zero-prefixed-literal", # 00_1000_000
"-Aclippy::type_complexity", # raison d'etre
"-Aclippy::nonminimal-bool", # maybe
"-Aclippy::borrowed-box", # Reasonable to fix this one
"-Aclippy::too-many-arguments", # (Turning this on would lead to)
"-Aclippy::unnecessary_cast", # Types may change
"-Aclippy::identity-op", # One case where we do 0 +
"-Aclippy::useless_conversion", # Types may change
"-Aclippy::unit_arg", # styalistic.
"-Aclippy::option-map-unit-fn", # styalistic
"-Aclippy::bind_instead_of_map", # styalistic
"-Aclippy::erasing_op", # E.g. 0 * DOLLARS
"-Aclippy::eq_op", # In tests we test equality.
"-Aclippy::while_immutable_condition", # false positives
"-Aclippy::needless_option_as_deref", # false positives
"-Aclippy::derivable_impls", # false positives
"-Aclippy::stable_sort_primitive", # prefer stable sort
]
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ updates:
- dependency-name: "sp-*"
- dependency-name: "frame-*"
- dependency-name: "fork-tree"
- dependency-name: "remote-externalities"
- dependency-name: "frame-remote-externalities"
- dependency-name: "pallet-*"
- dependency-name: "beefy-*"
- dependency-name: "try-runtime-*"
Expand All @@ -21,6 +21,6 @@ updates:
interval: "daily"
- package-ecosystem: github-actions
directory: '/'
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E3-dependencies"]
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E2-dependencies"]
schedule:
interval: daily
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ polkadot.*
!polkadot.service
!.rpm/*
.DS_Store
.cargo
.env
44 changes: 21 additions & 23 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,20 @@ variables:
GIT_DEPTH: 100
CI_SERVER_NAME: "GitLab CI"
CI_IMAGE: "paritytech/ci-linux:production"
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.78"
PIPELINE_SCRIPTS_TAG: "v0.4"

default:
cache: {}
retry:
max: 2
when:
- runner_system_failure
- unknown_failure
- api_failure
interruptible: true

.collect-artifacts:
artifacts:
Expand All @@ -61,6 +68,7 @@ default:
# they will be used if the job fails
.pipeline-stopper-vars:
before_script:
- !reference [.job-switcher, before_script]
- echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
Expand All @@ -71,34 +79,29 @@ default:
reports:
dotenv: pipeline-stopper.env

.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:
retry:
max: 2
when:
- runner_system_failure
- unknown_failure
- api_failure
interruptible: true
image: "${CI_IMAGE}"
before_script:
- !reference [.job-switcher, before_script]
tags:
- kubernetes-parity-build

.docker-env:
image: "${CI_IMAGE}"
retry:
max: 2
when:
- runner_system_failure
- unknown_failure
- api_failure
interruptible: true
before_script:
- !reference [.job-switcher, before_script]
tags:
- linux-docker
- linux-docker-vm-c2

.compiler-info:
before_script:
- !reference [.job-switcher, before_script]
- rustup show
- cargo --version
- sccache -s

.test-refs:
rules:
Expand Down Expand Up @@ -150,10 +153,8 @@ default:
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1

.build-push-image:
extends:
- .kubernetes-env
image: quay.io/buildah/stable:v1.27
before_script:
- !reference [.job-switcher, before_script]
- test -s ./artifacts/VERSION || exit 1
- test -s ./artifacts/EXTRATAG || exit 1
- VERSION="$(cat ./artifacts/VERSION)"
Expand Down Expand Up @@ -196,8 +197,6 @@ include:
# zombienet jobs
- scripts/ci/gitlab/pipeline/zombienet.yml



#### stage: .post

deploy-parity-testnet:
Expand Down Expand Up @@ -242,7 +241,6 @@ remove-cancel-pipeline-message:
PR_NUM: "${CI_COMMIT_REF_NAME}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
branch: "as-improve"

cancel-pipeline-test-linux-stable:
extends: .cancel-pipeline-template
Expand Down
Loading

0 comments on commit ec8ffc2

Please sign in to comment.