From e2ca06b5d4a5168b380dd1f93876875bfc18f7a8 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Tue, 18 Feb 2025 16:10:29 -0700
Subject: [PATCH 1/2] chore: Name nightly ci steps

---
 .github/workflows/nightly.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 71d351f..2c8731f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -57,23 +57,29 @@ jobs:
 #VERSIONS
     name: ${{ matrix.name }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/login-action@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GHCR
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: rust-lang
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: docker/login-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: rustopsbot
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
-      - id: meta
+      - name: Docker Metadata
+        id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
@@ -81,7 +87,8 @@ jobs:
             ghcr.io/rust-lang/rust
           tags: ${{ matrix.tags }}
 
-      - uses: docker/build-push-action@v5
+      - name: Build and push image
+        uses: docker/build-push-action@v5
         with:
           context: ${{ matrix.context }}
           platforms: ${{ matrix.platforms }}

From c4001ec7138454ff247ec4b2fb4a10db2cfd2dab Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Tue, 18 Feb 2025 16:14:35 -0700
Subject: [PATCH 2/2] chore(ci): Temporary workaround for ARM builds

---
 .github/workflows/nightly.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2c8731f..a3591eb 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -61,6 +61,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        # Temporary workaround for ARM builds
+        # https://github.com/docker/setup-qemu-action/issues/198
+        with:
+          image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GHCR