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-rewards
Browse files Browse the repository at this point in the history
* master: (23 commits)
  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)
  Companion for new Trie cache (#5897)
  [ci] Add check-runtime-migration job (#5891)
  Governance 2 (Part 1, Non-Controversial Changes) (#5892)
  Added Dwellir bootnodes for Kusama and Polkadot (#5772)
  ...
  • Loading branch information
ordian committed Aug 29, 2022
2 parents 5b8d2a4 + 81a969c commit e71e64c
Show file tree
Hide file tree
Showing 202 changed files with 5,025 additions and 3,484 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/github-tagger@v0.0.2
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
28 changes: 27 additions & 1 deletion .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 Down Expand Up @@ -624,6 +624,32 @@ check-try-runtime:
# Check that everything compiles with `try-runtime` feature flag.
- cargo check --features try-runtime --all

# 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
# this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
Expand Down
Loading

0 comments on commit e71e64c

Please sign in to comment.