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

Commit 7785be8

Browse files
author
Andronik
committed
Merge branch 'master' into ao-kusama-enable-dispute-slashes
* master: (98 commits) Ensure max_weight is assigned properly in AllowTopPaidExecutionFrom (#6787) Explicitly Handling ProvisionableData Cases (#6757) Companion for Substrate#12520 (#6730) Revert back to bare metal runners for weights generation (#6762) Improve XCM fuzzer (#6190) Corrected weight trader comment (#6752) clean up executed migrations (#6763) Remove state migration from westend runtime. (#6737) polkadot companion #12608 (Pools claim permissions) (#6753) Add Turboflakes bootnodes to Polkadot, Kusama and Westend (#6628) Companion for substrate#13284 (#6653) Companion for Substrate #13410: Introduce EnsureOrigin to democracy.propose (#6750) `BlockId` removal: `BlockBuilderProvider::new_block_at` (#6734) Companion PR for PR#13119 (#6683) Companion for Substrate#13411: frame/beefy: prune entries in set id session mapping (#6743) `BlockId` removal: refactor of runtime API (#6721) Fix auction bench (#6747) Use PVF code paired with executor params wherever possible (#6742) Retire `OldV1SessionInfo` (#6744) Companion for substrate #13121 - BEEFY Equivocations support (#6593) ...
2 parents a9bd663 + d4df26f commit 7785be8

File tree

504 files changed

+43514
-20260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

504 files changed

+43514
-20260
lines changed

‎.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ rustflags = [
2929
"-Aclippy::needless_option_as_deref", # false positives
3030
"-Aclippy::derivable_impls", # false positives
3131
"-Aclippy::stable_sort_primitive", # prefer stable sort
32-
]
32+
]

‎.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
updates:
33
- package-ecosystem: "cargo"
44
directory: "/"
5-
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
5+
labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
66
# Handle updates for crates from github.com/paritytech/substrate manually.
77
ignore:
88
- dependency-name: "substrate-*"
@@ -21,6 +21,6 @@ updates:
2121
interval: "daily"
2222
- package-ecosystem: github-actions
2323
directory: '/'
24-
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E2-dependencies"]
24+
labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
2525
schedule:
2626
interval: daily

‎.github/pr-custom-review.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ rules:
2020
condition:
2121
include: .*
2222
# excluding files from 'Runtime files' and 'CI files' rules
23-
exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
23+
exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^(?!.*\.dic$|.*spellcheck\.toml$)scripts/ci/.*|^\.github/.*
2424
min_approvals: 2
2525
teams:
2626
- core-devs
2727

2828
- name: CI files
2929
check_type: changed_files
3030
condition:
31-
include: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
31+
# dictionary files are excluded
32+
include: ^\.gitlab-ci\.yml|^(?!.*\.dic$|.*spellcheck\.toml$)scripts/ci/.*|^\.github/.*
3233
min_approvals: 2
3334
teams:
3435
- ci

‎.github/workflows/auto-label-prs.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.github/workflows/check-D-labels.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Check D labels
2+
3+
on:
4+
pull_request:
5+
types: [labeled, opened, synchronize, unlabeled]
6+
paths:
7+
- runtime/polkadot/**
8+
- runtime/kusama/**
9+
- runtime/common/**
10+
- primitives/src/**
11+
12+
jobs:
13+
check-labels:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Pull image
17+
env:
18+
IMAGE: paritytech/ruled_labels:0.4.0
19+
run: docker pull $IMAGE
20+
21+
- name: Check labels
22+
env:
23+
IMAGE: paritytech/ruled_labels:0.4.0
24+
MOUNT: /work
25+
GITHUB_PR: ${{ github.event.pull_request.number }}
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
API_BASE: https://api.github.com/repos
28+
REPO: ${{ github.repository }}
29+
RULES_PATH: labels/ruled_labels
30+
CHECK_SPECS: specs_polkadot.yaml
31+
run: |
32+
echo "REPO: ${REPO}"
33+
echo "GITHUB_PR: ${GITHUB_PR}"
34+
# Clone repo with labels specs
35+
git clone https://github.com/paritytech/labels
36+
# Fetch the labels for the PR under test
37+
labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
38+
39+
if [ -z "${labels}" ]; then
40+
docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
41+
fi
42+
43+
labels_args=${labels: :-1}
44+
printf "Checking labels: %s\n" "${labels_args}"
45+
46+
# Prevent the shell from splitting labels with spaces
47+
IFS=","
48+
49+
# --dev is more useful to debug mode to debug
50+
docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit

‎.github/workflows/check-labels.yml

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,38 @@ jobs:
88
check-labels:
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: Checkout sources
12-
uses: actions/checkout@v3
13-
with:
14-
fetch-depth: 0
15-
ref: ${{ github.event.pull_request.head.ref }}
16-
repository: ${{ github.event.pull_request.head.repo.full_name }}
11+
- name: Pull image
12+
env:
13+
IMAGE: paritytech/ruled_labels:0.4.0
14+
run: docker pull $IMAGE
15+
1716
- name: Check labels
18-
run: bash ${{ github.workspace }}/scripts/ci/github/check_labels.sh
1917
env:
18+
IMAGE: paritytech/ruled_labels:0.4.0
19+
MOUNT: /work
2020
GITHUB_PR: ${{ github.event.pull_request.number }}
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22-
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
23-
BASE_SHA: ${{ github.event.pull_request.base.sha }}
22+
API_BASE: https://api.github.com/repos
23+
REPO: ${{ github.repository }}
24+
RULES_PATH: labels/ruled_labels
25+
CHECK_SPECS: specs_polkadot.yaml
26+
run: |
27+
echo "REPO: ${REPO}"
28+
echo "GITHUB_PR: ${GITHUB_PR}"
29+
# Clone repo with labels specs
30+
git clone https://github.com/paritytech/labels
31+
# Fetch the labels for the PR under test
32+
labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
33+
34+
if [ -z "${labels}" ]; then
35+
docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags PR --no-label
36+
fi
37+
38+
labels_args=${labels: :-1}
39+
printf "Checking labels: %s\n" "${labels_args}"
40+
41+
# Prevent the shell from splitting labels with spaces
42+
IFS=","
43+
44+
# --dev is more useful to debug mode to debug
45+
docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags PR

‎.github/workflows/check-licenses.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Check licenses
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check-licenses:
8+
runs-on: ubuntu-22.04
9+
steps:
10+
- name: Checkout sources
11+
uses: actions/[email protected]
12+
- uses: actions/[email protected]
13+
with:
14+
node-version: '16.19.0'
15+
registry-url: 'https://npm.pkg.github.com'
16+
scope: '@paritytech'
17+
- name: Check the licenses
18+
run: |
19+
shopt -s globstar
20+
21+
npx @paritytech/[email protected] scan \
22+
--ensure-licenses Apache-2.0 \
23+
--ensure-licenses GPL-3.0-only \
24+
./**/*.rs
25+
env:
26+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release-50_publish-docker-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
password: ${{ secrets.DOCKERHUB_TOKEN }}
2828
- name: Build and push
2929
id: docker_build
30-
uses: docker/build-push-action@v3
30+
uses: docker/build-push-action@v4
3131
with:
3232
push: true
3333
file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile

‎.github/workflows/release-51_publish-docker-manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
password: ${{ secrets.DOCKERHUB_TOKEN }}
3535
- name: Build and push
3636
id: docker_build
37-
uses: docker/build-push-action@v3
37+
uses: docker/build-push-action@v4
3838
with:
3939
push: true
4040
file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ runtime/wasm/target/
88
.vscode
99
polkadot.*
1010
!polkadot.service
11-
!.rpm/*
1211
.DS_Store
1312
.env

0 commit comments

Comments
 (0)