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-disputes-offences-runtime
Browse files Browse the repository at this point in the history
* master: (40 commits)
  fix cargo check -p polkadot-node-core-provisioner --all-features (#5942)
  Change validation & collation protocol names to include genesis hash & fork id (#5876)
  Fix some typos in dispute-coordinator (#5941)
  version bumps (0.9.28) (#5933)
  Bump futures-util from 0.3.21 to 0.3.23 (#5922)
  Companion for 12095 (#5924)
  use generated preimage weight (#5904)
  Update Substrate to make companion check happy (#5934)
  Fix wrong logic. (#5931)
  update weights (#5911)
  Clean up MigrateToV10 (#5921)
  Bump async-trait from 0.1.56 to 0.1.57 (#5919)
  Send back empty votes + log in approval-voting in case candidate entry is missing. (#5925)
  chore: bump zombienet version (#5914)
  Bump indexmap from 1.9.0 to 1.9.1 (#5918)
  Bump proc-macro2 from 1.0.40 to 1.0.43 (#5878)
  Bump hyper from 0.14.19 to 0.14.20 (#5901)
  Fix output file for updating weights in run_benches_for_runtime.sh (#5906)
  Companion to Substrate PR 12006 (#5913)
  pin gha versions (#5916)
  ...
  • Loading branch information
ordian committed Aug 31, 2022
2 parents ce879df + 6573248 commit b070f34
Show file tree
Hide file tree
Showing 295 changed files with 6,867 additions and 3,983 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/auto-label-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Label drafts
uses: andymckay/labeler@master
uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
if: github.event.pull_request.draft == true
with:
add-labels: 'A3-inprogress'
remove-labels: 'A0-pleasereview'
- name: Label PRs
uses: andymckay/labeler@master
uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial')
with:
add-labels: 'A0-pleasereview'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-10_candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ jobs:
echo "::set-output name=first_rc::true"
fi
- name: Apply new tag
uses: tvdias/[email protected]
uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
with:
# We can't use the normal GITHUB_TOKEN for the following reason:
# https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
# RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
tag: ${{ steps.compute_tag.outputs.new_tag }}
- id: create-issue
uses: JasonEtco/create-an-issue@v2
uses: JasonEtco/create-an-issue@9e6213aec58987fa7d2f4deb8b256b99e63107a2 # v2.6.0
# Only create the issue if it's the first release candidate
if: steps.compute_tag.outputs.first_rc == 'true'
env:
Expand Down
100 changes: 87 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ variables:
CI_IMAGE: "paritytech/ci-linux:production"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.51"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.56"
PIPELINE_SCRIPTS_TAG: "v0.4"

default:
Expand All @@ -54,6 +54,19 @@ default:
paths:
- ./artifacts/

# collecting vars for pipeline stopper
# they will be used if the job fails
.pipeline-stopper-vars: &pipeline-stopper-vars
- 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
- echo "PR_NUM=${CI_COMMIT_REF_NAME}" >> pipeline-stopper.env

.pipeline-stopper-artifacts: &pipeline-stopper-artifacts
artifacts:
reports:
dotenv: pipeline-stopper.env

.kubernetes-env: &kubernetes-env
retry:
max: 2
Expand Down Expand Up @@ -172,7 +185,8 @@ check-runtime:
stage: stage1
image: paritytech/tools:latest
<<: *kubernetes-env
<<: *test-refs
rules:
- if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
variables:
GITLAB_API: "https://gitlab.parity.io/api/v4"
GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api"
Expand Down Expand Up @@ -222,8 +236,12 @@ build-linux-stable:
test-linux-stable:
stage: stage1
<<: *docker-env
<<: *compiler-info
<<: *common-refs
<<: *pipeline-stopper-artifacts
before_script:
- rustup show
- cargo --version
- *pipeline-stopper-vars
variables:
RUST_TOOLCHAIN: stable
# Enable debug assertions since we are running optimized builds for testing
Expand Down Expand Up @@ -307,7 +325,7 @@ build-staking-miner:
stage: stage2
# this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
needs:
- job: check-runtime
- job: cargo-fmt
artifacts: false
<<: *docker-env
<<: *test-pr-refs
Expand Down Expand Up @@ -336,7 +354,7 @@ test-node-metrics:
stage: stage2
# this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
needs:
- job: check-runtime
- job: cargo-fmt
artifacts: false
<<: *docker-env
<<: *compiler-info
Expand Down Expand Up @@ -605,7 +623,32 @@ check-try-runtime:
script:
# Check that everything compiles with `try-runtime` feature flag.
- cargo check --features try-runtime --all
- sccache -s

# More info can be found here: https://github.com/paritytech/polkadot/pull/5865
# Works only in PRs
check-runtime-migration:
stage: stage3
# this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
needs:
- job: test-node-metrics
artifacts: false
<<: *test-pr-refs
<<: *docker-env
<<: *compiler-info
script:
- |
export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \
-H "Authorization: token $GITHUB_PR_TOKEN" \
https://api.github.com/repos/paritytech/polkadot/issues/$CI_COMMIT_REF_NAME/labels | grep "E1" | wc -l)
- |
if [[ $has_runtimemigration_label != 0 ]]; then
echo "Found label runtimemigration. Running tests"
export RUST_LOG=remote-ext=debug,runtime=debug
time cargo test --release -p westend-runtime -p polkadot-runtime -p kusama-runtime --features try-runtime
else
echo "runtimemigration label not found. Skipping"
fi
check-no-default-features:
stage: stage3
Expand Down Expand Up @@ -738,6 +781,36 @@ zombienet-tests-parachains-disputes:
tags:
- zombienet-polkadot-integration-test

zombienet-tests-parachains-disputes-garbage-candidate:
stage: stage3
image: "${ZOMBIENET_IMAGE}"
<<: *kubernetes-env
<<: *zombienet-refs
needs:
- job: publish-polkadot-debug-image
- job: publish-test-collators-image
- job: publish-malus-image
variables:
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
before_script:
- echo "Zombie-net Tests Config"
- echo "${ZOMBIENET_IMAGE_NAME}"
- echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
- echo "${GH_DIR}"
- export DEBUG=zombie,zombie::network-node
- export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0003-parachains-garbage-candidate.feature"
allow_failure: false
retry: 2
tags:
- zombienet-polkadot-integration-test

zombienet-test-parachains-upgrade-smoke-test:
stage: stage3
image: "${ZOMBIENET_IMAGE}"
Expand Down Expand Up @@ -974,17 +1047,18 @@ short-benchmark-westend:
when: on_failure
variables:
PROJECT_ID: "${CI_PROJECT_ID}"
PROJECT_NAME: "${CI_PROJECT_NAME}"
PIPELINE_ID: "${CI_PIPELINE_ID}"
trigger: "parity/infrastructure/ci_cd/pipeline-stopper"
FAILED_JOB_URL: "${FAILED_JOB_URL}"
FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
PR_NUM: "${PR_NUM}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
# remove branch, when pipeline-stopper for polakdot is updated to the same branch
branch: "as-improve"

cancel-pipeline-test-linux-stable:
extends: .cancel-pipeline-template
needs:
- job: test-linux-stable
artifacts: false

cancel-pipeline-check-try-runtime:
extends: .cancel-pipeline-template
needs:
- job: check-try-runtime
artifacts: false
Loading

0 comments on commit b070f34

Please sign in to comment.