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-5535-followup
Browse files Browse the repository at this point in the history
* master:
  guide: remove refences to outdated secondary checkers (#6309)
  Use CPU clock timeout for PVF jobs (#6282)
  support opengov calls in proxy definitions (#6366)
  Companion for: MMR: move RPC code from frame/ to client/ (#6369)
  Clippyfy (#6341)
  sync versions with current release (0.9.33) (#6363)
  Add Collectives as Trusted Teleporter (#6326)
  Remove `parity-util-mem` from `runtime-api` cache (#6367)
  Companion for: pallet-mmr: move offchain logic to client-side gadget (#6321)
  remove executed migrations (0.9.33) (#6364)
  dispute-coordinator: fix earliest session checks for pruning and import (#6358)
  [ci] fix implementer guide job (#6357)
  Provide some more granular metrics for polkadot_pvf_execution_time (#6346)
  Add more granularity to prometheus histogram buckets (#6348)
  cargo update -p sp-io (#6351)
  Add support for outbound only configs on request/response protocols (#6343)
  • Loading branch information
ordian committed Nov 30, 2022
2 parents 4e36bed + 6343ae7 commit d9f337f
Show file tree
Hide file tree
Showing 192 changed files with 1,565 additions and 1,196 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
]
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
28 changes: 9 additions & 19 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,21 @@ 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 Down Expand Up @@ -72,25 +80,12 @@ default:
dotenv: pipeline-stopper.env

.kubernetes-env:
retry:
max: 2
when:
- runner_system_failure
- unknown_failure
- api_failure
interruptible: true
image: "${CI_IMAGE}"
tags:
- kubernetes-parity-build

.docker-env:
image: "${CI_IMAGE}"
retry:
max: 2
when:
- runner_system_failure
- unknown_failure
- api_failure
interruptible: true
tags:
- linux-docker

Expand Down Expand Up @@ -150,9 +145,6 @@ 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:
- test -s ./artifacts/VERSION || exit 1
- test -s ./artifacts/EXTRATAG || exit 1
Expand Down Expand Up @@ -196,8 +188,6 @@ include:
# zombienet jobs
- scripts/ci/gitlab/pipeline/zombienet.yml



#### stage: .post

deploy-parity-testnet:
Expand Down
Loading

0 comments on commit d9f337f

Please sign in to comment.