From e03ea0bd716ccb21ad94414ea393a742dd7f5a65 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 28 Aug 2024 17:54:48 -0400
Subject: [PATCH] fix(ci): try fix brotli edge-case (#8256)

seemingly not running apt install in this case
---
 .github/spot-runner-action/src/userdata.ts | 5 +++--
 yarn-project/README.md                     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/spot-runner-action/src/userdata.ts b/.github/spot-runner-action/src/userdata.ts
index 976cad46eb8..e15b7097e6b 100644
--- a/.github/spot-runner-action/src/userdata.ts
+++ b/.github/spot-runner-action/src/userdata.ts
@@ -22,7 +22,8 @@ export class UserData {
       `sudo service docker restart`,
       "sudo wget -q https://github.com/earthly/earthly/releases/download/v0.8.10/earthly-linux-$(dpkg --print-architecture) -O /usr/local/bin/earthly",
       "sudo chmod +x /usr/local/bin/earthly",
-      "for i in {1..3} ; do sudo apt install -y brotli && break; sleep 10; done",
+      `sudo bash -c 'echo \'Acquire::Retries "3"; Acquire::https::Timeout "240"; Acquire::http::Timeout "240"; APT::Get::Assume-Yes "true"; APT::Install-Recommends "false"; APT::Install-Suggests "false";\' > /etc/apt/apt.conf.d/99-aztec-build'`,
+      "sudo apt install -y brotli",
       'echo "MaxStartups 1000" >> /etc/ssh/sshd_config',
       'echo "ClientAliveInterval=30" >> /etc/ssh/sshd_config',
       'echo "ClientAliveCountMax=20" >> /etc/ssh/sshd_config',
@@ -35,4 +36,4 @@ export class UserData {
     );
     return Buffer.from(cmds.join("\n")).toString("base64");
   }
-}
\ No newline at end of file
+}
diff --git a/yarn-project/README.md b/yarn-project/README.md
index ef499215bcc..d3da1172535 100644
--- a/yarn-project/README.md
+++ b/yarn-project/README.md
@@ -85,7 +85,7 @@ COMMIT_TAG=<RELEASE_TAG_NUMBER_YOU_WANT e.g. aztec-packages-v0.8.8>
     - Best to run the `deploy_package()` method line by line by manually setting `REPOSITORY` var.
     - Extract `VERSION` as the script shows (in the eg it should be 0.8.8)
     - Skip the version existing checks like `if [ "$VERSION" == "$PUBLISHED_VERSION" ]` and `if [ "$VERSION" != "$HIGHER_VERSION" ]`. Since this is our first time deploying the package, `PUBLISHED_VERSION` and `HIGHER_VERSION` will be empty and hence these checks would fail. These checks are necessary in the CI for continual releases.
-    - Locally update the package version in package.json using `jq` as shown in the script
+    - Locally update the package version in package.json using `jq` as shown in the script.
     - Do a dry-run
     - If dry run succeeds, publish the package!
 5. Create a PR by adding your package into the `deploy-npm` script so next release onwards, CI can cut releases for your package.