From b77de6958adbc216dcaf95ce40a604a28b6720ab Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Wed, 11 Oct 2023 14:37:46 +1100
Subject: [PATCH] Re-enable ARM builds

---
 .github/workflows/docker.yml  |  8 ++++----
 .github/workflows/release.yml | 11 +++++++++--
 Cargo.lock                    |  2 +-
 Cargo.toml                    |  3 +--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ec43f496b44..8145503e707 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -60,8 +60,9 @@ jobs:
         runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release"]') || 'ubuntu-22.04'  }}
         strategy:
             matrix:
-                # FIXME(sproul) re-enable ARM builds
-                binary: [x86_64,
+                binary: [aarch64,
+                         aarch64-portable,
+                         x86_64,
                          x86_64-portable]
                 features: [
                     {version_suffix: "", env: "gnosis,slasher-lmdb,slasher-mdbx,jemalloc"},
@@ -141,10 +142,9 @@ jobs:
                   echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
 
             - name: Create and push multiarch manifest
-              # FIXME(sproul): Fix ARM builds and put this back
-              # ${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX}${{ matrix.modernity }} \
               run: |
                   docker buildx imagetools create -t ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX}${{ matrix.modernity }} \
+                      ${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX}${{ matrix.modernity }} \
                       ${IMAGE_NAME}:${VERSION}-amd64${VERSION_SUFFIX}${{ matrix.modernity }};
 
     build-docker-lcli:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f84218e376f..24ca09ec00e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,15 +29,22 @@ jobs:
     build:
         name:   Build Release
         strategy:
-            # FIXME(sproul): fix xdelta build for ARM
             matrix:
-                arch: [x86_64-unknown-linux-gnu,
+                arch: [aarch64-unknown-linux-gnu,
+                       aarch64-unknown-linux-gnu-portable,
+                       x86_64-unknown-linux-gnu,
                        x86_64-unknown-linux-gnu-portable,
                        x86_64-apple-darwin,
                        x86_64-apple-darwin-portable,
                        x86_64-windows,
                        x86_64-windows-portable]
                 include:
+                    -   arch: aarch64-unknown-linux-gnu
+                        runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest'  }}
+                        profile: maxperf
+                    -   arch: aarch64-unknown-linux-gnu-portable
+                        runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest'  }}
+                        profile: maxperf
                     -   arch: x86_64-unknown-linux-gnu
                         runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest'  }}
                         profile: maxperf
diff --git a/Cargo.lock b/Cargo.lock
index a7862f321c0..157c4aad91c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9306,7 +9306,7 @@ dependencies = [
 [[package]]
 name = "xdelta3"
 version = "0.1.5"
-source = "git+http://github.com/michaelsproul/xdelta3-rs?rev=cb3be8d445c0ed2adf815c62b14c197ca19bd94a#cb3be8d445c0ed2adf815c62b14c197ca19bd94a"
+source = "git+http://github.com/michaelsproul/xdelta3-rs?rev=d12f71b36a55b5ca0247a38151fb7c2be5c0e742#d12f71b36a55b5ca0247a38151fb7c2be5c0e742"
 dependencies = [
  "bindgen 0.66.1",
  "cc",
diff --git a/Cargo.toml b/Cargo.toml
index d147b22cdee..886c4176e14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -168,8 +168,7 @@ url = "2"
 uuid = { version = "0.8", features = ["serde", "v4"] }
 # TODO update to warp 0.3.6 after released.
 warp = { git = "https://github.com/seanmonstar/warp.git", default-features = false, features = ["tls"] }
-# FIXME(sproul): restore upstream
-xdelta3 = { git = "http://github.com/michaelsproul/xdelta3-rs", rev="cb3be8d445c0ed2adf815c62b14c197ca19bd94a" }
+xdelta3 = { git = "http://github.com/michaelsproul/xdelta3-rs", rev="d12f71b36a55b5ca0247a38151fb7c2be5c0e742" }
 zeroize = { version = "1", features = ["zeroize_derive"] }
 zip = "0.6"
 zstd = "0.11.2"