Merge branch 'master' into nv-bench-proposer

.github/workflows/auto-label-issues.yml

@@ -0,0 +1,17 @@
+# If the author of the issues is not a contributor to the project, label
+# the issue with 'Z0-unconfirmed'
+
+name: Label New Issues
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  label-new-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Label drafts
+        uses: andymckay/labeler@master
+        if: github.event.issue.author_association == "NONE"
+        with:
+          add-labels: 'Z0-unconfirmed'

.github/workflows/polkadot-companion-labels.yml

@@ -9,14 +9,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Monitor the status of the gitlab-check-companion-build job
-        uses: s3krit/await-status-action@4528ebbdf6e29bbec77c41caad1b2dec148ba894
+        uses: s3krit/await-status-action@v1.0.1
         id: 'check-companion-status'
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
           ref: ${{ github.event.pull_request.head.sha }}
           contexts: 'continuous-integration/gitlab-check-polkadot-companion-build'
           timeout: 1800
           notPresentTimeout: 3600 # It can take quite a while before the job starts...
+          failureStates: failure
+          interruptedStates: error # Error = job was probably cancelled. We don't want to label the PR in that case
       - name: Label success
         uses: andymckay/labeler@master
         if: steps.check-companion-status.outputs.result == 'success'

.maintain/gitlab/generate_changelog.sh

@@ -19,18 +19,17 @@ while IFS= read -r line; do
   if has_label 'paritytech/substrate' "$pr_id" 'B0-silent'; then
     continue
   fi
-  if has_label 'paritytech/substrate' "$pr_id" 'B1-runtimenoteworthy'; then
-    runtime_changes="$runtime_changes
+  if has_label 'paritytech/substrate' "$pr_id" 'B3-apinoteworthy' ; then
+    api_changes="$api_changes
 $line"
   fi
-  if has_label 'paritytech/substrate' "$pr_id" 'B1-clientnoteworthy'; then
+  if has_label 'paritytech/substrate' "$pr_id" 'B5-clientnoteworthy'; then
     client_changes="$client_changes
 $line"
   fi
-   if has_label 'paritytech/substrate' "$pr_id" 'B1-apinoteworthy' ; then
-    api_changes="$api_changes
+  if has_label 'paritytech/substrate' "$pr_id" 'B7-runtimenoteworthy'; then
+    runtime_changes="$runtime_changes
 $line"
-    continue
   fi
 done <<< "$all_changes"
 

.maintain/gitlab/lib.sh

@@ -5,7 +5,7 @@ api_base="https://api.github.com/repos"
 # Function to take 2 git tags/commits and get any lines from commit messages
 # that contain something that looks like a PR reference: e.g., (#1234)
 sanitised_git_logs(){
-  git --no-pager log --pretty=format:"%s" "$1..$2" |
+  git --no-pager log --pretty=format:"%s" "$1...$2" |
   # Only find messages referencing a PR
   grep -E '\(#[0-9]+\)' |
   # Strip any asterisks

.maintain/sentry-node/docker-compose.yml

@@ -131,11 +131,6 @@ services:
       - "sub-authority-discovery=trace"
       - "--prometheus-external"
 
-  ui:
-    image: polkadot-js/apps
-    ports:
-      - "3000:80"
-
   prometheus:
     image: prom/prometheus
     networks:

.maintain/sentry-node/prometheus/prometheus.yml

@@ -2,7 +2,7 @@ global:
   scrape_interval: 15s
 
 scrape_configs:
-  - job_name: 'substrate_validator-a'
+  - job_name: 'substrate-nodes'
     static_configs:
       - targets: ['validator-a:9615']
         labels: