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-5535-followup
Browse files Browse the repository at this point in the history
* master:
  add erasure-coding benches (#6308)
  Fix set-output deprecation (#6554)
  pre-checking: Reject failed PVFs (#6492)
  pvf: Fix missing execution request when retrying preparation (#6537)
  Updated Dwellir bootnodes. Now using wss. (#6534)
  handle substrate-node-template and substrate-parachain-template (#6541)
  Westend state trie to version 1 (#6336)
  Add a paragraph about slashing in runtime disputes section from the guide (#6531)
  Re-export current primitives in crate root (#6487)
  Improve inactive fund tracking (#6471)
  Bump JasonEtco/create-an-issue from 2.6.0 to 2.9.1 (#6473)
  ci: mark update-weights non-interruptible (#6539)
  Trigger update-node-template when a final release tag is created (#6522)
  Minor fixes (#6533)
  Update the GHA srtool-actions to the latest version (#6532)
  • Loading branch information
ordian committed Jan 16, 2023
2 parents 9d81c26 + 8801373 commit 9d3fb1c
Show file tree
Hide file tree
Showing 241 changed files with 1,022 additions and 530 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/release-10_candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ jobs:
# Get last rc tag if exists, else set it to {version}-rc1
version=${GITHUB_REF#refs/heads/release-}
echo "$version"
echo "::set-output name=version::$version"
echo "version=$version" >> $GITHUB_OUTPUT
git tag -l
last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
if [ -n "$last_rc" ]; then
suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
echo $suffix
((suffix++))
echo $suffix
echo "::set-output name=new_tag::$version-rc$suffix"
echo "::set-output name=first_rc::false"
echo "new_tag=$version-rc$suffix" >> $GITHUB_OUTPUT
echo "first_rc=false" >> $GITHUB_OUTPUT
else
echo "::set-output name=new_tag::$version-rc1"
echo "::set-output name=first_rc::true"
echo "new_tag=$version-rc1" >> $GITHUB_OUTPUT
echo "first_rc=true" >> $GITHUB_OUTPUT
fi
- name: Apply new tag
uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
Expand All @@ -42,7 +42,7 @@ jobs:
repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
tag: ${{ steps.compute_tag.outputs.new_tag }}
- id: create-issue
uses: JasonEtco/create-an-issue@9e6213aec58987fa7d2f4deb8b256b99e63107a2 # v2.6.0
uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
# Only create the issue if it's the first release candidate
if: steps.compute_tag.outputs.first_rc == 'true'
env:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/release-30_publish-draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
steps:
- id: get-rust-versions
run: |
echo "::set-output name=stable::$(rustc +stable --version)"
echo "::set-output name=nightly::$(rustc +nightly --version)"
echo "stable=$(rustc +stable --version)" >> $GITHUB_OUTPUT
echo "nightly=$(rustc +nightly --version)" >> $GITHUB_OUTPUT
build-runtimes:
runs-on: ubuntu-latest
Expand All @@ -40,9 +40,8 @@ jobs:
- name: Build ${{ matrix.runtime }} runtime
id: srtool_build
uses: chevdor/srtool-actions@v0.5.0
uses: chevdor/srtool-actions@v0.6.0
with:
# This is the default with chevdor/srtool-actions@v0.3.0+ but we make it clear
image: paritytech/srtool
chain: ${{ matrix.runtime }}

Expand Down Expand Up @@ -167,7 +166,7 @@ jobs:
ls "$RUNTIME_DIR/${{ matrix.runtime }}"
runtime_ver=$(ruby script.rb)
echo "Found version: >$runtime_ver<"
echo "::set-output name=runtime_ver::$runtime_ver"
echo "runtime_ver=$runtime_ver" >> $GITHUB_OUTPUT
- name: Upload compressed ${{ matrix.runtime }} wasm
uses: actions/upload-release-asset@v1
Expand Down
136 changes: 125 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions erasure-coding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ parity-scale-codec = { version = "3.1.5", default-features = false, features = [
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.31"

[dev-dependencies]
criterion = { version = "0.4.0", default-features = false, features = ["cargo_bench_support"] }

[[bench]]
name = "scaling_with_validators"
harness = false
Loading

0 comments on commit 9d3fb1c

Please sign in to comment.