Skip to content

Commit

Permalink
Merge branch 'master' into polkadot-v0.9.42
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrylavrenov authored Sep 10, 2024
2 parents aa34747 + 49fc577 commit f589def
Show file tree
Hide file tree
Showing 20 changed files with 810 additions and 395 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ updates:
directory: "/"
schedule:
interval: "daily"
ignore:
# Substrate and frontier related deps as all of them are controlled in our forks.
- dependency-name: "frame-*"
- dependency-name: "pallet-*"
- dependency-name: "sc-*"
- dependency-name: "sp-*"
- dependency-name: "fc-*"
- dependency-name: "fp-*"
- dependency-name: "substrate-*"
- dependency-name: "try-runtime-cli"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
26 changes: 20 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,27 @@
"[toml]": {
"editor.defaultFormatter": "tamasfe.even-better-toml"
},
// This takes too long when working with substrate, as it build the whole
// runtime each time the node host code is built.
"rust-analyzer.cargo.buildScripts.enable": false,
// Uncomment this while working on runtime.
// "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
// "rust-analyzer.cargo.noDefaultFeatures": true,
// Avoid conflicts with command line.
"rust-analyzer.cargo.targetDir": true,
// Improve stability.
"rust-analyzer.server.extraEnv": {
"CHALK_OVERFLOW_DEPTH": "100000000",
"CHALK_SOLVER_MAX_SIZE": "10000000"
},
"rust-analyzer.cargo.features": "all",
"rust-analyzer.cargo.extraEnv": {
// Skip building WASM, there is never need for it here.
"SKIP_WASM_BUILD": "1"
},
// Don't expand some problematic proc_macros
"rust-analyzer.procMacro.ignored": {
"async-trait": ["async_trait"],
"napi-derive": ["napi"],
"async-recursion": ["async_recursion"],
"async-std": ["async_std"]
},
"rust-analyzer.workspace.symbol.search.scope": "workspace_and_dependencies",
"rust-analyzer.workspace.symbol.search.kind": "all_symbols",
"vitest.commandLine": "yarn utils/e2e-tests/ts test:watch --",
"vitest.include": [
"utils/e2e-tests/ts/**/tests/**/*.ts",
Expand Down
88 changes: 44 additions & 44 deletions Cargo.lock

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

Loading

0 comments on commit f589def

Please sign in to comment.