Merge branch 'main' into fix-full-sync-fail

.github/workflows/continous-delivery.yml

@@ -65,6 +65,7 @@ jobs:
   #
   # The image will be commonly named `zebrad:<short-hash | github-ref | semver>`
   build:
+    name: Build CD Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile

.github/workflows/continous-integration-docker.patch.yml

@@ -31,7 +31,7 @@ jobs:
       - run: 'echo "No build required"'
 
   build:
-    name: Build / Build images
+    name: Build CI Docker / Build images
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'

.github/workflows/continous-integration-docker.yml

@@ -165,7 +165,7 @@ jobs:
           fi
 
   build:
-    name: Build
+    name: Build CI Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile

.github/workflows/continous-integration-os.patch.yml

@@ -16,6 +16,9 @@ on:
 jobs:
   test:
     name: Test ${{ matrix.rust }} on ${{ matrix.os }}${{ matrix.features }}
+    # We're just doing this job for the name, the platform doesn't matter.
+    # So we use the platform with the most concurrent instances.
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801

.github/workflows/continous-integration-os.yml

@@ -28,7 +28,7 @@ on:
       - '.cargo/config.toml'
       - '**/clippy.toml'
       # workflow definitions
-      - '.github/workflows/ci.yml'
+      - '.github/workflows/continous-integration-os.yml'
   pull_request:
     paths:
       # code and tests

.github/workflows/lint.patch.yml

@@ -2,8 +2,6 @@ name: Lint
 
 on:
   pull_request:
-    branches:
-      - 'main'
 
 jobs:
   clippy:

.github/workflows/lint.yml

@@ -14,8 +14,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - 'main'
 
 env:
   CARGO_INCREMENTAL: 0

.github/workflows/release-binaries.yml

@@ -20,6 +20,7 @@ jobs:
   #
   # The image will be named `zebrad:<semver>`
   build:
+    name: Build Release Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile

.github/workflows/zcash-lightwalletd.patch.yml

@@ -4,8 +4,6 @@ name: zcash-lightwalletd
 # run a fake CI job to satisfy the branch protection rules.
 on:
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - 'zebra-rpc/**'
       - 'zebrad/tests/acceptance.rs'
@@ -16,7 +14,7 @@ on:
 
 jobs:
   build:
-    name: Build images
+    name: Build lightwalletd Docker
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'

.github/workflows/zcash-lightwalletd.yml

@@ -31,8 +31,6 @@ on:
 
   # Update the lightwalletd image when each related PR changes
   pull_request:
-    branches:
-      - main
     paths:
       # rebuild lightwalletd whenever the related Zebra code changes
       # (this code isn't actually compiled in this docker image)
@@ -50,7 +48,7 @@ env:
 
 jobs:
   build:
-    name: Build images
+    name: Build lightwalletd Docker
     runs-on: ubuntu-latest
     permissions:
       contents: 'read'

.github/workflows/zcash-params.yml

@@ -24,6 +24,7 @@ on:
 
 jobs:
   build:
+    name: Build Zcash Params Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/zcash-params/Dockerfile