Merge remote-tracking branch 'origin/master' into oty-paginated-list

paritytech · Jul 19, 2023 · dbceffa · dbceffa
2 parents 19bdd0e + d584815
commit dbceffa
Show file tree

Hide file tree

Showing 988 changed files with 29,478 additions and 20,245 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -29,5 +29,5 @@ rustflags = [
   "-Aclippy::needless_option_as_deref",  # false positives
   "-Aclippy::derivable_impls",           # false positives
   "-Aclippy::stable_sort_primitive",     # prefer stable sort
-  "-Aclippy::extra-unused-type-parameters" # stylistic
+  "-Aclippy::extra-unused-type-parameters", # stylistic
 ]
diff --git a/.github/workflows/monthly-tag.yml b/.github/workflows/monthly-tag.yml
@@ -13,8 +13,8 @@ jobs:
       - name: Get the tags by date
         id: tags
         run: |
-          echo "::set-output name=new::$(date +'monthly-%Y-%m')"
-          echo "::set-output name=old::$(date -d'1 month ago' +'monthly-%Y-%m')"
+          echo "new=$(date +'monthly-%Y-%m')" >> $GITHUB_OUTPUT
+          echo "old=$(date -d'1 month ago' +'monthly-%Y-%m')" >> $GITHUB_OUTPUT
       - name: Checkout branch "master"
         uses: actions/checkout@v3
         with:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ variables:
   CARGO_INCREMENTAL: 0
   DOCKER_OS: "debian:bullseye"
   ARCH: "x86_64"
-  CI_IMAGE: "paritytech/ci-linux:production"
+  CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
   BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
   RELENG_SCRIPTS_BRANCH: "master"
@@ -301,8 +301,12 @@ include:
   # completion, because the publishing jobs depends on them AS INTENDED: crates should not be
   # published before their source code is checked.
   - project: parity/infrastructure/ci_cd/shared
-    ref: v0.2
+    ref: main
     file: /common/timestamp.yml
+  - project: parity/infrastructure/ci_cd/shared
+    ref: main
+    file: /common/ci-unified.yml
+
 
 #### stage:                        notify
 

diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
@@ -5,7 +5,7 @@
 //! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
 //! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
 //! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
-//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+//! EXECUTION: `{{cmd.execution}}`, WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}`
 
 // Executed Command:
 {{#each args as |arg|}}
@@ -78,7 +78,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	{{/each}}
 }
 
-// For backwards compatibility and tests
+// For backwards compatibility and tests.
 impl WeightInfo for () {
 	{{#each benchmarks as |benchmark|}}
 	{{#each benchmark.comments as |comment|}}