From 1183c1051799d12abeec70f9eae5fd68acb74d33 Mon Sep 17 00:00:00 2001
From: "Sean P. Kelly" <seankell@amazon.com>
Date: Fri, 11 Oct 2024 16:12:06 +0000
Subject: [PATCH] fixup: gha

---
 .github/workflows/release.yml | 5 +++++
 Cargo.toml                    | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8056b7b1..eca78802 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -137,6 +137,11 @@ jobs:
         # do agree on 'cat' and '$()' so we use that to marshal values between commands.
         run: |
           export PATH=$CARGO_HOME/bin:$PATH
+          # cargo-cross warns us that multiple cross configurations are present in our
+          # workspace, but it picks the appropriate one.
+          #
+          # These warnings cause the tool to fail, so we disable them.
+          export CROSS_NO_WARNINGS=0
           # Actually do builds and make zips and whatnot
           cargo dist build --tag="${GITHUB_REF_NAME}" --output-format=json ${MATRIX_DIST_ARGS} > dist-manifest.json
           echo "dist ran successfully"
diff --git a/Cargo.toml b/Cargo.toml
index b8d0b522..8553f661 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,8 +39,11 @@ targets = ["x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl"]
 [workspace.metadata.cross.build]
 pre-build = [
     # install golang for krane-bundle
-    # "dpkg --add-architecture $CROSS_DEB_ARCH", 
-    "apt update && apt --assume-yes install golang-1.22"
+    "apt update && apt --assume-yes install golang-1.22",
+    "update-alternatives --install /usr/bin/go go /usr/lib/go-1.22/bin/go 10",
+    # give the builder access to the go build and module caches
+    "mkdir /.cache && chmod a+rw /.cache",
+    "mkdir /go && chmod a+rw /go",
 ]
 
 [workspace.dependencies]