Skip to content

Commit

Permalink
Merge branch 'master' into noandrea-workflow-maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
RomarQ committed Nov 27, 2024
2 parents 7cc2526 + c315e70 commit f8780b8
Show file tree
Hide file tree
Showing 170 changed files with 15,578 additions and 2,467 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Get Latest RT Release
id: get-latest-rt
run: |
LATEST_RUNTIME_RELEASE=$(curl -s https://api.github.com/repos/moonbeam-foundation/moonbeam/releases | jq -r '.[] | select(.name | test("runtime";"i")) | .tag_name' | head -n 1 | tr -d '[:blank:]') && [[ ! -z "${LATEST_RUNTIME_RELEASE}" ]]
LATEST_RUNTIME_RELEASE=$(curl -s https://api.github.com/repos/moonbeam-foundation/moonbeam/releases | jq -r '.[] | select(.name | test("runtime";"i")) | .tag_name' | sort -rs | head -n 1 | tr -d '[:blank:]') && [[ ! -z "${LATEST_RUNTIME_RELEASE}" ]]
echo $LATEST_RUNTIME_RELEASE
echo "latest_rt=$LATEST_RUNTIME_RELEASE" >> $GITHUB_OUTPUT
- name: Get Sha
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/check-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
labels: bare-metal
permissions:
contents: read
strategy:
matrix:
runtime: [moonbeam, moonbase, moonriver]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -59,8 +62,8 @@ jobs:
- name: Run benchmarks
shell: bash
run: |
./scripts/run-benches-for-runtime.sh moonbase release
if [[ -f "benchmarking_errors.txt" ]]; then
./scripts/run-benches-for-runtime.sh ${{ matrix.runtime }} release
if test -f "benchmarking_errors.txt"; then
cat benchmarking_errors.txt
exit 1
fi
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Get Latest RT Release
id: get-latest-rt
run: |
LATEST_RUNTIME_RELEASE=$(curl -s https://api.github.com/repos/moonbeam-foundation/moonbeam/releases | jq -r '.[] | select(.name | test("runtime";"i")) | .tag_name' | head -n 1 | tr -d '[:blank:]')
LATEST_RUNTIME_RELEASE=$(curl -s https://api.github.com/repos/moonbeam-foundation/moonbeam/releases | jq -r '.[] | select(.name | test("runtime";"i")) | .tag_name' | sort -rs | head -n 1 | tr -d '[:blank:]')
echo $LATEST_RUNTIME_RELEASE
echo "latest_rt=$LATEST_RUNTIME_RELEASE" >> $GITHUB_OUTPUT
- name: Get Sha
Expand Down
31 changes: 15 additions & 16 deletions Cargo.lock

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

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,7 @@ slices = "0.2.0"
strum = { version = "0.26.3", default-features = false, features = ["derive"] }
strum_macros = "0.24"
smallvec = "1.11.0"
p256 = { version = "0.13.2", default-features = false, features = [
"ecdsa"] }
p256 = { version = "0.13.2", default-features = false, features = ["ecdsa"] }
ansi_term = "0.12.1"

# Other (client)
Expand Down
5 changes: 5 additions & 0 deletions node/cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ pub struct RunCmd {
#[clap(long)]
pub dev_service: bool,

/// Enable the new block import strategy
/// Deprecated in: https://github.com/Moonsong-Labs/moonkit/pull/43
#[clap(long)]
pub experimental_block_import_strategy: bool,

#[cfg(feature = "lazy-loading")]
#[clap(long)]
pub fork_chain_from_rpc: Option<String>,
Expand Down
Loading

0 comments on commit f8780b8

Please sign in to comment.