From 56c9935eef8f675828e0ca5359c909787a154b0a Mon Sep 17 00:00:00 2001
From: antondlr <anton@delaruelle.net>
Date: Tue, 26 Mar 2024 12:08:31 +0100
Subject: [PATCH] cleanup

---
 .github/workflows/docker.yml | 15 +++++----------
 Cross.toml                   |  6 ++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 896ba5725ba..99bb4227319 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -60,7 +60,7 @@ jobs:
         runs-on: ${{ github.repository == 'antondlr/lighthouse' && fromJson('["self-hosted", "linux", "release"]') || 'ubuntu-22.04'  }}
         strategy:
             matrix:
-                binary: [aarch64,
+                binary: [aarch64-portable,
                          x86_64-portable]
                 features: [
                     {env: "gnosis,spec-minimal,slasher-lmdb,jemalloc"},
@@ -85,11 +85,6 @@ jobs:
                   cargo install cross
                   env CROSS_PROFILE=${{ matrix.profile }} CROSS_FEATURES=${{ matrix.features.env }} make build-${{ matrix.binary }}
 
-#            - name: move binary
-#              run: |
-#                mkdir ./bin; \
-#                find ./target -type f -name "lighthouse" -exec mv {} /bin/ \;
-
             - name: Make bin dir
               run: mkdir ./bin
             - name: Move cross-built binary into Docker scope (if ARM)
@@ -98,7 +93,6 @@ jobs:
             - name: Move cross-built binary into Docker scope (if x86_64)
               if: startsWith(matrix.binary, 'x86_64')
               run: mv ./target/x86_64-unknown-linux-gnu/${{ matrix.profile }}/lighthouse ./bin
-
             - name: Map aarch64 to arm64 short arch
               if: startsWith(matrix.binary, 'aarch64')
               run: echo "SHORT_ARCH=arm64" >> $GITHUB_ENV
@@ -142,13 +136,14 @@ jobs:
               run: |
                   echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
 
-            - name: Create and push multiarch manifest
-              # not making multiarch manifests for deprecated tags
+            - name: Create and push multiarch manifests
               run: |
                   docker buildx imagetools create -t ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX} \
                       ${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX} \
                       ${IMAGE_NAME}:${VERSION}-amd64${VERSION_SUFFIX};
-
+                  docker buildx imagetools create -t ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX}-modern \
+                      ${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX}-modern \
+                      ${IMAGE_NAME}:${VERSION}-amd64${VERSION_SUFFIX}-modern;
 
     build-docker-lcli:
         runs-on: ubuntu-22.04
diff --git a/Cross.toml b/Cross.toml
index 6be3d06ec0f..871391253d3 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,7 +1,5 @@
 [target.x86_64-unknown-linux-gnu]
-pre-build = ["apt-get install -y cmake clang-5.0 lld-8"]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
+pre-build = ["apt-get install -y cmake clang-5.0"]
 
 [target.aarch64-unknown-linux-gnu]
-pre-build = ["apt-get install -y cmake clang-5.0 lld-8"]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
+pre-build = ["apt-get install -y cmake clang-5.0"]