Skip to content

Commit

Permalink
Merge branch 'master' into es-migration-build
Browse files Browse the repository at this point in the history
  • Loading branch information
AndWeHaveAPlan authored Sep 3, 2024
2 parents a205703 + f6eeca9 commit 420c361
Show file tree
Hide file tree
Showing 963 changed files with 64,812 additions and 24,867 deletions.
2 changes: 1 addition & 1 deletion .config/lychee.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exclude = [
"https://github.com/paritytech/polkadot-sdk/substrate/frame/timestamp",
"https://github.com/paritytech/substrate/frame/fast-unstake",
"https://github.com/zkcrypto/bls12_381/blob/e224ad4ea1babfc582ccd751c2bf128611d10936/src/test-data/mod.rs",
"https://polkadot-try-runtime-node.parity-chains.parity.io/",
"https://polkadot.network/the-path-of-a-parachain-block/",
"https://research.web3.foundation/en/latest/polkadot/NPoS/3.%20Balancing.html",
"https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model",
Expand All @@ -41,6 +40,7 @@ exclude = [
"https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#inflation-model",
"https://research.web3.foundation/en/latest/polkadot/slashing/npos.html",
"https://rpc.polkadot.io/",
"https://try-runtime.polkadot.io/",
"https://w3f.github.io/parachain-implementers-guide/node/approval/approval-distribution.html",
"https://w3f.github.io/parachain-implementers-guide/node/index.html",
"https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html",
Expand Down
2 changes: 1 addition & 1 deletion .config/zepter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ workflows:
]
# The umbrella crate uses more features, so we to check those too:
check_umbrella:
- [ $check.0, '--features=serde,experimental,runtime,with-tracing,tuples-96,with-tracing', '-p=polkadot-sdk' ]
- [ $check.0, '--features=serde,experimental,riscv,runtime,with-tracing,tuples-96,with-tracing', '-p=polkadot-sdk' ]
# Same as `check_*`, but with the `--fix` flag.
default:
- [ $check.0, '--fix' ]
Expand Down
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
/substrate/primitives/merkle-mountain-range/ @acatangiu

# Contracts
/substrate/frame/contracts/ @athei @paritytech/docs-audit
/substrate/frame/contracts/ @paritytech/smart-contracts @paritytech/docs-audit
/substrate/frame/revive/ @paritytech/smart-contracts @paritytech/docs-audit

# NPoS and election
/substrate/frame/election-provider-multi-phase/ @paritytech/staking-core @paritytech/docs-audit
Expand Down
22 changes: 22 additions & 0 deletions .github/actions/cargo-check-runtimes/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: 'cargo check runtimes'
description: 'Runs `cargo check` for every directory in provided root.'
inputs:
root:
description: "Root directory. Expected to contain several cargo packages inside."
required: true
runs:
using: "composite"
steps:
- name: Check
shell: bash
run: |
mkdir -p ~/.forklift
cp .forklift/config.toml ~/.forklift/config.toml
cd ${{ inputs.root }}
for directory in $(echo */); do
echo "_____Running cargo check for ${directory} ______";
cd ${directory};
pwd;
SKIP_WASM_BUILD=1 forklift cargo check --locked;
cd ..;
done
15 changes: 15 additions & 0 deletions .github/actions/set-up-mac/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# How to use

```yml
set-image:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- id: set_image
run: cat .github/env >> $GITHUB_OUTPUT
- name: Install dependencies
uses: ./.github/actions/set-up-mac
with:
IMAGE: ${{ steps.set-image.outputs.IMAGE }}
```
43 changes: 43 additions & 0 deletions .github/actions/set-up-mac/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: "Set up rust on mac"
description: "Install the required tools for Mac runners"
inputs:
IMAGE:
description: "Rust docker image"
required: true
runs:
using: "composite"
steps:
- name: Install with Hombrew
shell: bash
run: brew install protobuf rustup openssl pkg-config zlib xz zstd llvm jq curl gcc make cmake
- name: Set version
shell: bash
run: |
VERSION=$(echo $IMAGE | sed -E 's/.*:bullseye-([^-]+)-.*/\1/')
echo $VERSION
echo "VERSION=$VERSION" >> $GITHUB_ENV
NIGHTLY=$(echo $IMAGE | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')
echo $NIGHTLY
echo "NIGHTLY=$NIGHTLY" >> $GITHUB_ENV
env:
IMAGE: ${{ inputs.IMAGE }}

- name: Install rustup
shell: bash
run: |
rustup-init -y
rustup install $VERSION
rustup default $VERSION
rustup toolchain install "nightly-${NIGHTLY}"
- name: MacOS Deps
shell: bash
run: |
rustup target add wasm32-unknown-unknown --toolchain $VERSION
rustup component add rust-src rustfmt clippy --toolchain $VERSION
- name: Check Rust
shell: bash
run: |
rustup show
rustup +nightly show
Binary file removed .github/command-screnshot.png
Binary file not shown.
265 changes: 0 additions & 265 deletions .github/commands-readme.md

This file was deleted.

1 change: 1 addition & 0 deletions .github/pull_request_template.md
Loading

0 comments on commit 420c361

Please sign in to comment.