Merge latest unstable

sigp · May 3, 2023 · 3e10b26 · 3e10b26
2 parents 37ec9b7 + 826e748
commit 3e10b26
Show file tree

Hide file tree

Showing 406 changed files with 15,257 additions and 13,665 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,7 +5,6 @@ on:
         branches:
             - unstable
             - stable
-            - capella
         tags:
             - v*
 
@@ -35,11 +34,6 @@ jobs:
               run: |
                     echo "VERSION=latest" >> $GITHUB_ENV
                     echo "VERSION_SUFFIX=-unstable" >> $GITHUB_ENV
-            - name: Extract version (if capella)
-              if: github.event.ref == 'refs/heads/capella'
-              run: |
-                    echo "VERSION=capella" >> $GITHUB_ENV
-                    echo "VERSION_SUFFIX=" >> $GITHUB_ENV
             - name: Extract version (if tagged release)
               if: startsWith(github.event.ref, 'refs/tags')
               run: |

diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
       - 'book/**'
+  merge_group:
 
 jobs:
   linkcheck:

diff --git a/.github/workflows/local-testnet.yml b/.github/workflows/local-testnet.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - unstable
   pull_request:
+  merge_group:
 
 jobs:
   run-local-testnet:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,7 +73,7 @@ jobs:
             - uses: KyleMayes/install-llvm-action@v1
               if: startsWith(matrix.arch, 'x86_64-windows')
               with:
-                version: "13.0"
+                version: "15.0"
                 directory: ${{ runner.temp }}/llvm
             - name: Set LIBCLANG_PATH
               if: startsWith(matrix.arch, 'x86_64-windows')

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -8,19 +8,20 @@ on:
       - trying
       - 'pr/*'
   pull_request:
+  merge_group:
 env:
   # Deny warnings in CI
   # Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
   RUSTFLAGS: "-D warnings -C debuginfo=0"
   # The Nightly version used for cargo-udeps, might need updating from time to time.
-  PINNED_NIGHTLY: nightly-2022-12-15
+  PINNED_NIGHTLY: nightly-2023-04-16
   # Prevent Github API rate limiting.
   LIGHTHOUSE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 jobs:
   target-branch-check:
     name: target-branch-check
     runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
     steps:
         - name: Check that the pull request is not targeting the stable branch
           run: test ${{ github.base_ref }} != "stable"
@@ -83,7 +84,7 @@ jobs:
       run: choco install -y make
     - uses: KyleMayes/install-llvm-action@v1
       with:
-        version: "13.0"
+        version: "15.0"
         directory: ${{ runner.temp }}/llvm
     - name: Set LIBCLANG_PATH
       run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV