From 36b378d3fcda05ec85bfa12f0234a0b4462eb8c5 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Tue, 28 Nov 2023 17:11:08 +0000
Subject: [PATCH] Compile for arm64 in GitHub Actions

Cross-architecture compile for arm64 on GitHub Actions' ubuntu-latest hosted runner.
See https://learn.microsoft.com/dotnet/core/deploying/native-aot/cross-compile#linux.
Effectively a revert of #973.
---
 .dockerignore               | 26 --------------------------
 .github/dependabot.yml      |  8 --------
 .github/workflows/build.yml | 15 +++++++++++++++
 Dockerfile                  | 18 ------------------
 build.ps1                   |  2 +-
 5 files changed, 16 insertions(+), 53 deletions(-)
 delete mode 100644 .dockerignore
 delete mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index cb71a42f..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,26 +0,0 @@
-**/.DS_Store
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/artifacts
-**/bin
-**/charts
-**/docker-compose*
-**/compose*
-**/Dockerfile*
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
-!.git/HEAD
-!.git/config
-!.git/refs/heads/
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 35488cd4..7f2f1b2f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,13 +1,5 @@
 version: 2
 updates:
-- package-ecosystem: docker
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "05:30"
-    timezone: Europe/London
-  reviewers:
-    - "martincostello"
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cc6104f..e0ac8ee6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,6 +52,21 @@ jobs:
 
     steps:
 
+    - name: Setup arm64 support for native AoT
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        dpkg --add-architecture arm64
+        bash -c 'cat > /etc/apt/sources.list.d/arm64.list <<EOF
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
+        EOF'
+        sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
+        sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
+        apt update
+        apt install --yes clang llvm binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu zlib1g-dev:arm64
+
     - name: Checkout code
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 9051fcf5..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0@sha256:bb65e39b662be0265f780afae9cdbfcaa315ef63edb245ad9fb2aa1aabca0b6b AS build
-ARG TARGETARCH
-
-RUN dpkg --add-architecture arm64
-RUN apt update && apt install --yes clang gcc-aarch64-linux-gnu llvm zlib1g-dev zlib1g-dev:arm64
-
-WORKDIR /source
-
-COPY . .
-
-RUN DOTNET_INSTALL_DIR="/usr/share/dotnet" && curl -sSL https://raw.githubusercontent.com/dotnet/install-scripts/5b142a1e445a6f060d6430b661408989e9580b85/src/dotnet-install.sh | bash /dev/stdin --jsonfile global.json --install-dir $DOTNET_INSTALL_DIR
-
-RUN --mount=type=cache,id=nuget,target=/root/.nuget/packages \
-    dotnet publish ./src/LondonTravel.Skill --runtime linux-arm64 --self-contained true /p:AssemblyName=bootstrap /p:PublishAot=true /p:PublishReadyToRun=true
-
-FROM scratch AS export
-ARG TARGETARCH
-COPY --from=build /source/artifacts/publish/LondonTravel.Skill/release_*/ ./artifacts/publish/LondonTravel.Skill/release_linux-arm64
diff --git a/build.ps1 b/build.ps1
index 98b42978..ce1782b6 100755
--- a/build.ps1
+++ b/build.ps1
@@ -91,7 +91,7 @@ function DotNetPublish {
 
     if ($IsLinux -And (-Not $UseManagedRuntime)) {
         $additionalArgs += "--runtime"
-        $additionalArgs += "linux-x64"
+        $additionalArgs += "linux-arm64"
         $additionalArgs += "--self-contained"
         $additionalArgs += "true"
         $additionalArgs += "/p:AssemblyName=bootstrap"