Skip to content

Commit

Permalink
Merge branch 'master' into runtime-diff-3000
Browse files Browse the repository at this point in the history
  • Loading branch information
noandrea committed Jul 5, 2024
2 parents 201bdd0 + ef07db1 commit 1a43a26
Show file tree
Hide file tree
Showing 289 changed files with 12,812 additions and 21,755 deletions.
1 change: 1 addition & 0 deletions .github/workflow-templates/cargo-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ runs:
if ! which "rustup" > /dev/null; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
fi
rustup override unset
rustup show
rustup target add wasm32-unknown-unknown
- name: Build Node
Expand Down
39 changes: 27 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
with:
ref: ${{ needs.set-tags.outputs.git_ref }}
- name: Use pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 8.6.12
- name: Use Node.js
Expand Down Expand Up @@ -226,7 +226,9 @@ jobs:
# With rustup's nice new toml format, we just need to run rustup show to install the toolchain
# https://github.com/actions-rs/toolchain/issues/126#issuecomment-782989659
- name: Setup Rust toolchain
run: rustup show
run: |
rustup override unset
rustup show
- name: Check Cargo.toml files format with toml_sort
run: ./scripts/check-cargo-toml-files-format.sh

Expand All @@ -240,7 +242,9 @@ jobs:
with:
ref: ${{ needs.set-tags.outputs.git_ref }}
- name: Setup Rust toolchain
run: rustup show
run: |
rustup override unset
rustup show
- name: Verifies all 'pallet-evm/ethereum' use 'forbid-evm-reentrancy' feature
run: ./scripts/check-forbid-evm-reentrancy.sh

Expand All @@ -256,7 +260,9 @@ jobs:
# With rustup's nice new toml format, we just need to run rustup show to install the toolchain
# https://github.com/actions-rs/toolchain/issues/126#issuecomment-782989659
- name: Setup Rust toolchain
run: rustup show
run: |
rustup override unset
rustup show
- name: Format code with rustfmt
run: cargo fmt -- --check

Expand All @@ -274,7 +280,9 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@v3
- name: Setup Rust toolchain
run: rustup show
run: |
rustup override unset
rustup show
# Development branch clippy check
- name: Clippy (dev)
if: github.ref != 'refs/heads/master' && !startsWith(github.ref, 'perm-')
Expand Down Expand Up @@ -338,6 +346,7 @@ jobs:
if ! which "rustup" > /dev/null; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
fi
rustup override unset
rustup show
rustup target add wasm32-unknown-unknown
# Checks are run after uploading artifacts since they are modified by the tests
Expand All @@ -364,8 +373,14 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ needs.set-tags.outputs.git_ref }}
- run: |
mkdir -p target/release
- name: Create local folders
run: |
mkdir -p target/release/wbuild/${{ matrix.chain }}-runtime/
- name: "Download branch built runtime"
uses: actions/download-artifact@v4
with:
name: runtimes
path: target/release/wbuild/${{ matrix.chain }}-runtime/
- name: "Download branch built node"
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -416,7 +431,7 @@ jobs:
name: moonbeam
path: build
- name: Use pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 8.6.12
- name: Use Node.js
Expand Down Expand Up @@ -483,7 +498,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.2.0
uses: docker/setup-buildx-action@v3.3.0
with:
version: latest
driver-opts: |
Expand All @@ -495,7 +510,7 @@ jobs:
password: ${{ secrets.MBF_DOCKERHUB_PASSWORD }}
- name: Build and push moonbeam
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: ./docker/moonbeam.Dockerfile
Expand Down Expand Up @@ -538,7 +553,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ needs.set-tags.outputs.git_ref }}
- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
with:
version: 8
- uses: actions/setup-node@v4
Expand Down Expand Up @@ -586,7 +601,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ needs.set-tags.outputs.git_ref }}
- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
with:
version: 8
- uses: actions/setup-node@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
if ! which "rustup" > /dev/null; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
fi
rustup override unset
rustup show
rustup target add wasm32-unknown-unknown
- name: Run benchmarks
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/client-release-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ on:
workflow_dispatch:
inputs:
from:
description: "Previous client version"
description: "Previous client version (eg. v0.35.0)"
required: true
to:
description: "Next client version"
description: "Next client version (eg. v0.36.0)"
required: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
labels: bare-metal
needs: ["set-tags"]
if: ${{ !github.event.pull_request.head.repo.fork }}
timeout-minutes: 60
timeout-minutes: 90
env:
RUSTC_WRAPPER: "sccache"
CARGO_INCREMENTAL: "0"
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ jobs:
# With rustup's nice new toml format, we just need to run rustup show to install the toolchain
# https://github.com/actions-rs/toolchain/issues/126#issuecomment-782989659
- name: Setup Rust toolchain
run: rustup show
run: |
rustup override unset
rustup show
- uses: actions/cache@v4
with:
Expand All @@ -46,7 +48,7 @@ jobs:
run: echo "<meta http-equiv=refresh content=0;url=moonbeam_runtime/index.html>" > ./target/doc/index.html

- name: Deploy documentation
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/prepare-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ jobs:
with:
ref: ${{ github.event.inputs.sha }}
- name: Setup Rust toolchain
run: rustup show
run: |
rustup override unset
rustup show
- name: Build Node
run: cargo build --profile=production --all
- name: Save parachain binary
Expand Down Expand Up @@ -67,7 +69,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.2.0
uses: docker/setup-buildx-action@v3.3.0
with:
version: latest
driver-opts: |
Expand All @@ -79,7 +81,7 @@ jobs:
password: ${{ secrets.MBF_DOCKERHUB_PASSWORD }}
- name: Build and push moonbeam
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: ./docker/moonbeam.Dockerfile
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/publish-runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,27 @@ jobs:
name: original-tools
path: tools

read-rust-version:
runs-on: bare-metal
outputs:
rust_version: ${{ steps.get-version.outputs.rust_version }}
steps:
- uses: actions/checkout@v4
- id: get-version
run: |
RUST_VERSION=$(cat rust-toolchain | grep channel | grep --only-matching --perl-regexp "(\d+\.){2}\d+(-nightly)?")
echo "::set-output name=rust_version::$RUST_VERSION"
build-srtool-runtimes:
needs: ["setup-scripts"]
needs: ["setup-scripts", "read-rust-version"]
runs-on: bare-metal
strategy:
matrix:
chain: ["moonbase", "moonriver", "moonbeam"]
srtool_image:
- moonbeamfoundation/srtool
srtool_image_tag:
- 1.74.0
- ${{ needs.read-rust-version.outputs.rust_version }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-typescript-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
with:
ref: ${{ github.event.inputs.sha }}
- name: Use pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 8.6.12
- name: Use Node.js
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/runtime-release-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ on:
workflow_dispatch:
inputs:
from:
description: "Previous runtime version (example: 1103)"
description: "Previous runtime spec version (example: 1103)"
required: true
to:
description: "Next runtime version (example: 1201)"
description: "Next runtime spec version (example: 1201)"
required: true
client:
description: "Last client release version"
description: "Last client release version (example: v0.34.0)"
required: true

jobs:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/subxt-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
path: build
- name: Install Subxt-cli
run: |
rustup override unset
rustup show
cargo install subxt-cli --locked
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- name: Run last_release node via Docker
Expand Down Expand Up @@ -125,6 +127,6 @@ jobs:
branch: "runtime-diff-${{ github.event.inputs.spec_version }}"
commit-message: "runtime diff: v0.${{ github.event.inputs.spec_version }}.0"
draft: true
title: "Notorize runtime upgrade differences: ${{ github.event.inputs.spec_version }}"
title: "Notorize runtime upgrade differences: runtime-${{ github.event.inputs.spec_version }}"
reviewers: "librelois,noandrea"
labels: "B0-silent,D2-notlive"
4 changes: 2 additions & 2 deletions .github/workflows/upgrade-typescript-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
node-version: 20.10.0
- name: Use pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 8
- name: Upgrade polkadotjs for moonbeam-types-bundle
Expand All @@ -53,6 +53,6 @@ jobs:
branch: "typescript-api-${{ github.event.inputs.spec_version }}"
commit-message: typescript API v0.${{ github.event.inputs.spec_version }}.0
draft: true
title: "Upgrade typescript API for runtime ${{ github.event.inputs.spec_version }}"
title: "Upgrade typescript API for runtime-${{ github.event.inputs.spec_version }}"
reviewers: "librelois,noandrea,timbrinded"
labels: "B0-silent,D2-notlive"
Loading

0 comments on commit 1a43a26

Please sign in to comment.