Skip to content

Commit

Permalink
Merge branch 'master' into tarekkma/state_migration
Browse files Browse the repository at this point in the history
  • Loading branch information
noandrea committed Sep 19, 2024
2 parents 2cb1e90 + 5904dee commit 38f9734
Show file tree
Hide file tree
Showing 130 changed files with 9,265 additions and 7,516 deletions.
15 changes: 8 additions & 7 deletions .github/workflow-templates/dev-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ inputs:
runs:
using: "composite"
steps:
- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
with:
version: 8.6.12
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22.8.0
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml

Expand All @@ -33,15 +33,16 @@ runs:
run: |
#### Preparing the legacy types
cd moonbeam-types-bundle
npm ci
npm run build
pnpm i
pnpm build
#### Preparing the typescript api
cd ../typescript-api
npm ci
pnpm i
pnpm build
cd ../test
pnpm i ../typescript-api
pnpm add ../typescript-api
- name: "Install and run dev test"
shell: bash
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
chmod +x bin/ec-linux-amd64
- name: Check files
# Prettier and editorconfig-checker have different ideas about indentation
run: /tmp/bin/ec-linux-amd64 --exclude "(typescript-api\/src\/moon(?:base|beam|river)\/interfaces\/.*\.ts)|(test\/contracts\/lib\/.*)" -disable-indent-size
run: /tmp/bin/ec-linux-amd64 --exclude "(typescript-api\/)|(test\/contracts\/lib\/.*)" -disable-indent-size

check-prettier:
name: "Check with Prettier"
Expand Down Expand Up @@ -200,11 +200,11 @@ jobs:
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
version: 8.6.12
version: 9
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml
- name: Run Eslint check
Expand Down Expand Up @@ -607,11 +607,11 @@ jobs:
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
version: 8.6.12
version: 9
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml
- run: |
Expand All @@ -633,12 +633,13 @@ jobs:
#### Preparing the repository
cd moonbeam-types-bundle
npm ci
npm run build
pnpm i
pnpm build
#### Preparing the typescript api
cd ../typescript-api
npm ci
pnpm i
pnpm build
- name: Running Tracing Tests
env:
DEBUG_COLOURS: "1"
Expand Down Expand Up @@ -719,10 +720,10 @@ jobs:
ref: ${{ needs.set-tags.outputs.git_ref }}
- uses: pnpm/action-setup@v4
with:
version: 8
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
- name: Create local folders
run: |
mkdir -p target/release/wbuild/${{ matrix.chain }}-runtime/
Expand Down Expand Up @@ -775,10 +776,10 @@ jobs:
ref: ${{ needs.set-tags.outputs.git_ref }}
- uses: pnpm/action-setup@v4
with:
version: 8
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
cache: "pnpm"
cache-dependency-path: test/pnpm-lock.yaml
- name: Create local folders
Expand Down Expand Up @@ -824,10 +825,10 @@ jobs:
ref: ${{ needs.set-tags.outputs.git_ref }}
- uses: pnpm/action-setup@v4
with:
version: 8
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
- name: Create local folders
run: |
mkdir -p target/release/wbuild/${{ matrix.chain }}-runtime/
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/check-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: Check benchmarks

on:
workflow_dispatch:
on:
schedule:
- cron: "0 5 * * 0" # Runs every Sunday at 5:00 AM UTC
- cron: "0 5 * * 3" # Runs every Wednesday at 5:00 AM UTC

jobs:
set-tags:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- 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"
echo "rust_version=$RUST_VERSION" >> $GITHUB_OUTPUT
build-srtool-runtimes:
needs: ["setup-scripts", "read-rust-version"]
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
GH_WORKFLOW_MATRIX_CHAIN: ${{ matrix.chain }}
GH_WORKFLOW_MATRIX_SRTOOL_IMAGE: ${{ matrix.srtool_image }}
GH_WORKFLOW_MATRIX_SRTOOL_IMAGE_TAG: ${{ matrix.srtool_image_tag }}
RUNTIME_BUILD_OPTS: "--features on-chain-release-build"
RUNTIME_BUILD_OPTS: "--features=on-chain-release-build"
RUNTIME_BUILD_PROFILE: "production"
run: |
# Ensure we have permissions to write to the runtime folder target for the docker user
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-typescript-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
- name: Build typescript API
run: |
cd typescript-api
Expand All @@ -40,11 +40,11 @@ jobs:
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
version: 8.6.12
version: 9
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
- name: Upgrade polkadotjs for tests
run: |
cd test
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/upgrade-typescript-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,20 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
version: 8
version: 9
- name: Upgrade polkadotjs for moonbeam-types-bundle
run: |
cd moonbeam-types-bundle
npm install @polkadot/api@latest
pnpm install
- name: Upgrade polkadotjs for typescript-api
run: |
cd typescript-api
npm install @polkadot/api@latest
npm install @polkadot/typegen@latest
npm run build
pnpm install
pnpm run build
- name: regenerate typescript api with new runtime metadata
run: |
cd typescript-api
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"editor.formatOnSave": true,
"editor.rulers": [100],
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
Expand Down
Loading

0 comments on commit 38f9734

Please sign in to comment.