Merge branch 'main' into dismiss-reviews

.github/review-bot.yml

@@ -4,29 +4,25 @@ rules:
       include:
         - ^\.github/.*
     type: fellows
-    minRank: 4
+    minRank: 3
     minApprovals: 2
   - name: Relay and system files
     condition:
       include:
-        - ^relay\/kusama\/.*
-        - ^relay\/polkadot\/.*
+        - ^relay\/.*
         - ^system-parachains\/.*
-        - ^CHANGELOG$
-      exclude: 
-        - ^relay\/.+\.adoc$
+        - ^CHANGELOG.md$
     type: fellows
-    minRank: 3
-    minApprovals: 4
+    minRank: 2
+    minApprovals: 3
   - name: General Files
     condition:
       include:
         - '.*'
-      exclude: 
-        - ^relay\/kusama\/.*
-        - ^relay\/polkadot\/.*
-        - ^\.github/.*
+      exclude:
+        - ^relay\/.*
         - ^system-parachains\/.*
-        - ^target\/.*
+        - ^\.github/.*
+        - ^CHANGELOG.md$
     type: fellows
-    minRank: 2
+    minRank: 1

.github/workflows/auto-merge.yml

@@ -8,15 +8,22 @@ on:
 jobs:
   set-auto-merge:
     runs-on: ubuntu-latest
+    environment: master
     # Important! This forces the job to run only on comments on Pull Requests that starts with '/merge'
     if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/merge') }}
     steps:
       - name: Get the GitHub handle of the fellows
         uses: paritytech/[email protected]
         id: fellows
+      - name: Generate token
+        id: merge_token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.MERGE_APP_ID }}
+          private_key: ${{ secrets.MERGE_APP_KEY }}
       - name: Set auto merge
         uses: paritytech/[email protected]
         with:
-          GITHUB_TOKEN: '${{ github.token }}'
+          GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }}
           MERGE_METHOD: "SQUASH"
           ALLOWLIST: ${{ steps.fellows.outputs.github-handles }}

.github/workflows/review-trigger.yml

@@ -1,6 +1,6 @@
 name: Review-Trigger
 
-on: 
+on:
   pull_request_target:
     types:
       - opened

CHANGELOG.md

@@ -4,6 +4,25 @@ Changelog for the runtimes governed by the Polkadot Fellowship.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [Unreleased]
+
+### Changed
+
+- Upgrade parachains runtime API from v5 to v7 in Polkadot and Kusama ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
+- Upgrade Preimage pallet's config implementations to adapt the new `Consideration` API ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
+- Remove `experimental` feature flag for `pallet-society`, `pallet-xcm`, and `runtime-common` crates imports ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
+- Election provider: use a geometric deposit base calculation for EPM signed submissions in Polkadot and Kusama ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
+
+### Fixed
+
+- Add missing weight functions for `runtime_parachains_hrmp` and `preimage` pallets ([polkadot-fellows/runtimes#56](https://github.com/polkadot-fellows/runtimes/pull/56))
+
+## [1.0.1] 22.10.2023
+
+### Changed
+
+- Restore governance lock periods to 7 days in Polkadot ([polkadot-fellows/runtimes#86](https://github.com/polkadot-fellows/runtimes/pull/86))
+
 ## [1.0.0] 22.10.2023
 
 ### Changed