From 9f05b6f13304c0d12033cbe773c034917de17e48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 05:07:00 +0000
Subject: [PATCH 01/10] Bump actions/upload-artifact from 4.4.3 to 4.5.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882...6f51ac03b9356f520e9adb1b1b7802705f340c2b)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/benchmark.yml      | 2 +-
 .github/workflows/build.yml          | 4 ++--
 .github/workflows/ossf-scorecard.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index a867d4fe..d112b75f 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -40,7 +40,7 @@ jobs:
       run: ./benchmark.ps1
 
     - name: Publish BenchmarkDotNet artifacts
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: ${{ !cancelled() }}
       with:
         name: artifacts
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 16722b2c..854327a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -89,7 +89,7 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Publish artifacts
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: artifacts-${{ matrix.os_name }}
         path: ./artifacts
@@ -115,7 +115,7 @@ jobs:
         subject-path: ./artifacts/${{ env.LAMBDA_FUNCTION }}.zip
 
     - name: Publish deployment package
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: runner.os == 'Linux' && success()
       with:
         name: ${{ env.ARTIFACT_NAME }}
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
index 00bd1690..1c90f7d4 100644
--- a/.github/workflows/ossf-scorecard.yml
+++ b/.github/workflows/ossf-scorecard.yml
@@ -33,7 +33,7 @@ jobs:
           results_format: sarif
 
       - name: Upload artifact
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: SARIF
           path: results.sarif

From d38fecf4f44f0287b66e963efd643b19a977d813 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:10:00 +0000
Subject: [PATCH 02/10] Use correct Ubuntu feed

Get the codename for the current version of Ubuntu and use that to add the appropriate apt feeds for arm64.
---
 .github/workflows/build.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 854327a3..85e32d4b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,11 +60,12 @@ jobs:
       if: runner.os == 'Linux'
       shell: bash
       run: |
+        codename=$(lsb_release -c | awk '{print $2}')
         sudo dpkg --add-architecture arm64
         sudo 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
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ "${codename}" main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ "${codename}-updates" main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ "${codename}-backports" main restricted universe multiverse
         EOF'
         sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
         sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list

From 73c34e2e9c3eb9ce6a148897cbc3deb330283eeb Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:15:26 +0000
Subject: [PATCH 03/10] Fix bash script

Use double quotes so that `codename` is evaluated.
---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 85e32d4b..e3c9edb7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,11 +62,11 @@ jobs:
       run: |
         codename=$(lsb_release -c | awk '{print $2}')
         sudo dpkg --add-architecture arm64
-        sudo bash -c 'cat > /etc/apt/sources.list.d/arm64.list <<EOF
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ "${codename}" main restricted
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ "${codename}-updates" main restricted
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ "${codename}-backports" main restricted universe multiverse
-        EOF'
+        sudo bash -c "cat > /etc/apt/sources.list.d/arm64.list <<EOF
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ '${codename}' main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ '${codename}'-updates main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ '${codename}-backports' main restricted universe multiverse
+        EOF"
         sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
         sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
         sudo apt update

From ee4927d6440eae6c02695358725148953bca033a Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:17:46 +0000
Subject: [PATCH 04/10] Fix escaping

Escape the values correctly.
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3c9edb7..1ff4f81d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,9 +63,9 @@ jobs:
         codename=$(lsb_release -c | awk '{print $2}')
         sudo dpkg --add-architecture arm64
         sudo bash -c "cat > /etc/apt/sources.list.d/arm64.list <<EOF
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ '${codename}' main restricted
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ '${codename}'-updates main restricted
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ '${codename}-backports' main restricted universe multiverse
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}\" main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-updates\" main restricted
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-backports\" main restricted universe multiverse
         EOF"
         sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
         sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list

From 907615a321af3daeac90d919cd370cc82b73a9f9 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:19:41 +0000
Subject: [PATCH 05/10] Simplify install

See if install works as-is.
---
 .github/workflows/build.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1ff4f81d..f6707287 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,15 +60,15 @@ jobs:
       if: runner.os == 'Linux'
       shell: bash
       run: |
-        codename=$(lsb_release -c | awk '{print $2}')
-        sudo dpkg --add-architecture arm64
-        sudo bash -c "cat > /etc/apt/sources.list.d/arm64.list <<EOF
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}\" main restricted
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-updates\" main restricted
-        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-backports\" main restricted universe multiverse
-        EOF"
-        sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
-        sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
+        #codename=$(lsb_release -c | awk '{print $2}')
+        #sudo dpkg --add-architecture arm64
+        #sudo bash -c "cat > /etc/apt/sources.list.d/arm64.list <<EOF
+        #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}\" main restricted
+        #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-updates\" main restricted
+        #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-backports\" main restricted universe multiverse
+        #EOF"
+        #sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
+        #sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
         sudo apt update
         sudo apt install --yes clang llvm binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu linux-libc-dev:arm64 zlib1g-dev:arm64
 

From 0019ed4a333eb34e274f6e84d21e5728641bb187 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:22:00 +0000
Subject: [PATCH 06/10] Enable arm64

Enable arm64 packages.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f6707287..9400b1fe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
       shell: bash
       run: |
         #codename=$(lsb_release -c | awk '{print $2}')
-        #sudo dpkg --add-architecture arm64
+        sudo dpkg --add-architecture arm64
         #sudo bash -c "cat > /etc/apt/sources.list.d/arm64.list <<EOF
         #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}\" main restricted
         #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-updates\" main restricted

From 2080f28f9bf6cfea6af49c8993c17175bba561b4 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:23:56 +0000
Subject: [PATCH 07/10] Echo debugging

What fails?
---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9400b1fe..dbe96533 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,6 +62,7 @@ jobs:
       run: |
         #codename=$(lsb_release -c | awk '{print $2}')
         sudo dpkg --add-architecture arm64
+        echo "arm64 enabled"
         #sudo bash -c "cat > /etc/apt/sources.list.d/arm64.list <<EOF
         #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}\" main restricted
         #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-updates\" main restricted
@@ -70,7 +71,9 @@ jobs:
         #sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
         #sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
         sudo apt update
+        "Package lists updated"
         sudo apt install --yes clang llvm binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu linux-libc-dev:arm64 zlib1g-dev:arm64
+        "Packages installed"
 
     - name: Checkout code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

From 95a198f173aa3224099c71eac167a892e0ce38dd Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:35:08 +0000
Subject: [PATCH 08/10] Switch to deb822 format

Try `deb822` format for the package sources.
---
 .github/workflows/build.yml | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dbe96533..e3f7fb97 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,20 +60,32 @@ jobs:
       if: runner.os == 'Linux'
       shell: bash
       run: |
-        #codename=$(lsb_release -c | awk '{print $2}')
+        codename=$(lsb_release -c | awk '{print $2}')
         sudo dpkg --add-architecture arm64
-        echo "arm64 enabled"
-        #sudo bash -c "cat > /etc/apt/sources.list.d/arm64.list <<EOF
-        #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}\" main restricted
-        #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-updates\" main restricted
-        #deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ \"${codename}-backports\" main restricted universe multiverse
-        #EOF"
-        #sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
-        #sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
+        sudo mkdir -p /etc/apt/sources.list.d/
+        sudo bash -c "cat > /etc/apt/sources.list.d/arm64.sources <<EOF
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: ${codename}
+        Architectures: arm64
+        Components: main restricted
+
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: ${codename}-updates
+        Architectures: arm64
+        Components: main restricted
+
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: ${codename}-backports
+        Architectures: arm64
+        Components: main restricted universe multiverse
+        EOF"
+        sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
+        sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
         sudo apt update
-        "Package lists updated"
         sudo apt install --yes clang llvm binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu linux-libc-dev:arm64 zlib1g-dev:arm64
-        "Packages installed"
 
     - name: Checkout code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

From 4380bdb556b2785f760fcb25104f6a8211a61b22 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:43:24 +0000
Subject: [PATCH 09/10] Try another syntax

See if this works.
---
 .github/workflows/build.yml | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3f7fb97..7a2761cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,27 +63,39 @@ jobs:
         codename=$(lsb_release -c | awk '{print $2}')
         sudo dpkg --add-architecture arm64
         sudo mkdir -p /etc/apt/sources.list.d/
-        sudo bash -c "cat > /etc/apt/sources.list.d/arm64.sources <<EOF
+        sudo bash -c "cat > /etc/apt/sources.list.d/ubuntu.sources <<EOF
         Types: deb
-        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        URIs: http://archive.ubuntu.com/ubuntu/
         Suites: ${codename}
-        Architectures: arm64
-        Components: main restricted
+        Components: main restricted universe
+        Architectures: amd64
 
         Types: deb
-        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        URIs: http://security.ubuntu.com/ubuntu/
+        Suites: ${codename}-security 
+        Components: main restricted universe
+        Architectures: amd64
+
+        Types: deb
+        URIs: http://archive.ubuntu.com/ubuntu/
         Suites: ${codename}-updates
+        Components: main restricted universe
+        Architectures: amd64
+
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: ${codename}
+        Components: main restricted multiverse universe
         Architectures: arm64
-        Components: main restricted
 
         Types: deb
         URIs: http://ports.ubuntu.com/ubuntu-ports/
-        Suites: ${codename}-backports
+        Suites: ${codename}-updates
+        Components: main restricted multiverse universe
         Architectures: arm64
-        Components: main restricted universe multiverse
         EOF"
-        sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
-        sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
+        sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list.d/ubuntu.sources
+        sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list.d/ubuntu.sources
         sudo apt update
         sudo apt install --yes clang llvm binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu linux-libc-dev:arm64 zlib1g-dev:arm64
 

From 65850f17de1df0219fa70d4a47def5499d34b0a0 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Wed, 18 Dec 2024 12:52:48 +0000
Subject: [PATCH 10/10] Refactor build script for arm64 support

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7a2761cc..0d9de251 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,10 +60,10 @@ jobs:
       if: runner.os == 'Linux'
       shell: bash
       run: |
+        apt_sources=/etc/apt/sources.list.d/ubuntu.sources
         codename=$(lsb_release -c | awk '{print $2}')
         sudo dpkg --add-architecture arm64
-        sudo mkdir -p /etc/apt/sources.list.d/
-        sudo bash -c "cat > /etc/apt/sources.list.d/ubuntu.sources <<EOF
+        sudo bash -c "cat > ${apt_sources} <<EOF
         Types: deb
         URIs: http://archive.ubuntu.com/ubuntu/
         Suites: ${codename}
@@ -94,8 +94,8 @@ jobs:
         Components: main restricted multiverse universe
         Architectures: arm64
         EOF"
-        sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list.d/ubuntu.sources
-        sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list.d/ubuntu.sources
+        sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' "${apt_sources}"
+        sudo sed -i -e 's/deb mirror/deb [arch=amd64] mirror/g' "${apt_sources}"
         sudo apt update
         sudo apt install --yes clang llvm binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu linux-libc-dev:arm64 zlib1g-dev:arm64