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: (39 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 5f1758f + db498ce commit 0fb61ff
Show file tree
Hide file tree
Showing 284 changed files with 7,951 additions and 5,902 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 12 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ variables:
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.78"
PIPELINE_SCRIPTS_TAG: "v0.4"

default:
cache: {}
Expand Down Expand Up @@ -69,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 @@ -79,21 +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:
image: "${CI_IMAGE}"
before_script:
- !reference [.job-switcher, before_script]
tags:
- kubernetes-parity-build

.docker-env:
image: "${CI_IMAGE}"
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 @@ -146,6 +154,7 @@ default:

.build-push-image:
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 @@ -232,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 0fb61ff

Please sign in to comment.