Merge branch 'master' into umbrella-authorship

paritytech · Jan 20, 2025 · 13f097c · 13f097c
2 parents 26582e5 + 711e6ff
commit 13f097c
Show file tree

Hide file tree

Showing 36 changed files with 822 additions and 361 deletions.
diff --git a/.github/scripts/generate-prdoc.py b/.github/scripts/generate-prdoc.py
@@ -86,10 +86,10 @@ def create_prdoc(pr, audience, title, description, patch, bump, force):
 			if p == '/':
 				exit(1)
 			p = os.path.dirname(p)
-		
+
 		with open(os.path.join(p, "Cargo.toml")) as f:
 			manifest = toml.load(f)
-		
+
 		if not "package" in manifest:
 			continue
 

diff --git a/.github/workflows/misc-sync-templates.yml b/.github/workflows/misc-sync-templates.yml
@@ -131,6 +131,12 @@ jobs:
       - name: Copy over the new changes
         run: |
           cp -r polkadot-sdk/templates/${{ matrix.template }}/* "${{ env.template-path }}/"
+      - name: Remove unnecessary files from parachain template
+        if: ${{ matrix.template == 'parachain' }}
+        run: |
+          rm -f "${{ env.template-path }}/README.docify.md"
+          rm -f "${{ env.template-path }}/Cargo.toml"
+          rm -f "${{ env.template-path }}/src/lib.rs"
 
       - name: Run psvm on monorepo workspace dependencies
         run: psvm -o -v ${{ github.event.inputs.stable_release_branch }} -p ./Cargo.toml