Merge branch 'main' into tsv-polkadot-coretime

.github/changelog-processor.py

@@ -45,6 +45,8 @@
     lines = changelog.readlines()
 
     if args.validate_changelog:
+        versions = set()
+
         for line in lines:
             if line.startswith("##"):
                 if line.startswith("###"):
@@ -57,6 +59,13 @@
                     print("Only Major.Minor.Patch are supported as versioning")
                     print(line)
                     sys.exit(-1)
+                else:
+                    version = line.strip().removeprefix("## [").split("]")[0]
+                    if version in versions:
+                        print("Found version '" + version + "' more than once")
+                        sys.exit(-1)
+                    else:
+                        versions.add(version)
             elif line.startswith("#"):
                 if line.strip() != "# Changelog":
                     print("Line starting with `#` is only allowed for `# Changelog`")

.github/workflows/auto-merge.yml

@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/merge') }}
     steps:
       - name: Get the GitHub handle of the fellows
-        uses: paritytech/get-fellows-action@v1.1.4
+        uses: paritytech/get-fellows-action@v1.2.0
         id: fellows
       - name: Generate a token
         id: merge_token

.github/workflows/review-bot.yml

@@ -26,7 +26,7 @@ jobs:
           app-id: ${{ secrets.REVIEW_APP_ID }}
           private-key: ${{ secrets.REVIEW_APP_KEY }}
       - name: "Evaluates PR reviews and assigns reviewers"
-        uses: paritytech/review-bot@v2.5.0
+        uses: paritytech/review-bot@v2.6.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           team-token: ${{ steps.team_token.outputs.token }}

.github/workflows/review-trigger.yml

@@ -28,7 +28,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
       - name: Get the GitHub handle of the fellows
-        uses: paritytech/get-fellows-action@v1.1.4
+        uses: paritytech/get-fellows-action@v1.2.0
         id: fellows
         # Require new reviews when the author is pushing and he is not a fellow
       - name: Fail when author pushes new code

CHANGELOG.md

@@ -14,7 +14,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - RFC-5: Add request revenue info ([runtimes#381](https://github.com/polkadot-fellows/runtimes/pull/381), [SDK v1.14 #3940](https://github.com/paritytech/polkadot-sdk/pull/3940)).
 - Core-Fellowship: new `promote_fast` call ([runtimes#381](https://github.com/polkadot-fellows/runtimes/pull/381), [SDK v1.14 #4877](https://github.com/paritytech/polkadot-sdk/pull/4877)).
 - Pallet ranked collective: max member count per rank ([runtimes#381](https://github.com/polkadot-fellows/runtimes/pull/381), [SDK v1.14 #4807](https://github.com/paritytech/polkadot-sdk/pull/4807)).
-
 - All runtimes: XcmPaymentApi and DryRunApi ([polkadot-fellows/runtimes#380](https://github.com/polkadot-fellows/runtimes/pull/380))
 - Enable Agile Coretime on Polkadot ([polkadot-fellows/runtimes#322](https://github.com/polkadot-fellows/runtimes/pull/322))
 

system-parachains/collectives/collectives-polkadot/src/ambassador/mod.rs

@@ -138,6 +138,9 @@ impl pallet_ranked_collective::Config<AmbassadorCollectiveInstance> for Runtime
 	type VoteWeight = VoteWeight;
 	type ExchangeOrigin = OpenGovOrHeadAmbassadors;
 	type MemberSwappedHandler = (crate::AmbassadorCore, crate::AmbassadorSalary);
+	#[cfg(feature = "runtime-benchmarks")]
+	type MaxMemberCount = ();
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type MaxMemberCount = AmbassadorMemberCount;
 	#[cfg(feature = "runtime-benchmarks")]
 	type BenchmarkSetup = (crate::AmbassadorCore, crate::AmbassadorSalary);
@@ -353,7 +356,7 @@ impl pallet_treasury::Config<AmbassadorTreasuryInstance> for Runtime {
 	>;
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(feature = "runtime-benchmarks")))]
 mod tests {
 	use super::*;