From bfe81fb5c59222b1c7e03043b639556e3d1b9ade Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 12:59:02 +0000
Subject: [PATCH] Bump actions/upload-artifact from 4.4.3 to 4.5.0 (#1529)

* 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>

* Fix arm64 sources for Ubuntu 24.04

- Get the codename for the current version of Ubuntu and use that to add the appropriate apt feeds for arm64.
- Use `deb822` format for the package sources.
- Write sources to the new sources file.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Martin Costello <martin@martincostello.com>
---
 .github/workflows/benchmark.yml      |  2 +-
 .github/workflows/build.yml          | 46 ++++++++++++++++++++++------
 .github/workflows/ossf-scorecard.yml |  2 +-
 3 files changed, 39 insertions(+), 11 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..0d9de251 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,14 +60,42 @@ 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 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'
-        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 bash -c "cat > ${apt_sources} <<EOF
+        Types: deb
+        URIs: http://archive.ubuntu.com/ubuntu/
+        Suites: ${codename}
+        Components: main restricted universe
+        Architectures: amd64
+
+        Types: deb
+        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
+
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: ${codename}-updates
+        Components: main restricted multiverse universe
+        Architectures: arm64
+        EOF"
+        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
 
@@ -89,7 +117,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 +143,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