Skip to content

Commit

Permalink
Merge branch 'master' into ozgun-into-location
Browse files Browse the repository at this point in the history
  • Loading branch information
acatangiu authored Jul 18, 2024
2 parents 99104b6 + d05cd9a commit 1afb530
Show file tree
Hide file tree
Showing 34 changed files with 548 additions and 306 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/command-fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ jobs:
GH_TOKEN: ${{ github.token }}
- name: Run FMT
run: |
cargo --version
rustc --version
cargo +nightly --version
rustc +nightly --version
cargo +nightly fmt
# format toml.
# since paritytech/ci-unified:bullseye-1.73.0-2023-11-01-v20231204 includes taplo-cli
taplo format --config .config/taplo.toml
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/misc-sync-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,12 @@ jobs:
"runtime",
]
resolver = "2"
[workspace.dependencies]
EOF
echo "$(toml get -r ./runtime/Cargo.toml 'package.name') = { path = \"./runtime\", default-features = false }" >> Cargo.toml
echo "$(toml get -r ./pallets/template/Cargo.toml 'package.name') = { path = \"./pallets/template\", default-features = false }" >> Cargo.toml
shell: bash
working-directory: polkadot-sdk/templates/${{ matrix.template }}/
- name: Update workspace configuration
Expand All @@ -116,9 +121,12 @@ jobs:
- name: Copy over the new changes
run: |
cp -r polkadot-sdk/templates/${{ matrix.template }}/* "${{ env.template-path }}/"
- name: Run psvm on monorepo workspace dependencies
run: psvm -o -v ${{ github.event.inputs.crate_release_version }} -p ./Cargo.toml
working-directory: polkadot-sdk/
- name: Copy over required workspace dependencies
run: |
echo -e "\n[workspace.dependencies]" >> Cargo.toml
set +e
# If a workspace dependency is required..
while cargo tree --depth 1 --prefix none --no-dedupe 2>&1 | grep 'was not found in `workspace.dependencies`'; do
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*.orig
*.rej
*.swp
*.wasm
**/._*
**/.criterion/
**/*.rs.bk
Expand Down
Loading

0 comments on commit 1afb530

Please sign in to comment.