From ea9182aab19e5d5e26705508e12d86929bfd99b4 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Mon, 13 May 2024 18:16:04 -0400
Subject: [PATCH 1/2] CI: Remove workaround for Homebrew node in Cirrus on
 macOS

This workaround was necessary before because something broke.

Now the workaround is the thing that breaks things.

Go figure.
---
 .cirrus.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c4ba42d30..181b58cb1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -134,7 +134,6 @@ silicon_mac_task:
     ROLLING_UPLOAD_TOKEN: ENCRYPTED[f935c396a9f4bca108ec2fdedb00dbc9be2f4c411f100d577acdab42db59ea134be059ce8535396db8222a2b1eb68c27]
   prepare_script:
     - brew update
-    - brew uninstall node
     - brew install git python@$PYTHON_VERSION python-setuptools
     - git submodule init
     - git submodule update
@@ -199,7 +198,6 @@ silicon_mac_task:
 #     - arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 #     - export PATH="/usr/local/bin:$PATH"
 #     - arch -x86_64 brew update
-#     - arch -x86_64 brew uninstall node
 #     - arch -x86_64 brew install node@16 git python@$PYTHON_VERSION python-setuptools
 #     - ln -s /usr/local/bin/python$PYTHON_VERSION /usr/local/bin/python
 #     - npm install -g yarn

From f560f7a2e52ab6f8178a34790fb83355e0232f83 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Mon, 13 May 2024 19:05:36 -0400
Subject: [PATCH 2/2] CI: brew uninstall node@20 in .cirrus.yml

Apparently it's not the "node" cask anymore in the base CI image,
it's the "node@20" cask. Wow.

The workaround of uninstalling this is still needed,
it's just that the package name has changed.
---
 .cirrus.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 181b58cb1..34c84e1dc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -134,6 +134,7 @@ silicon_mac_task:
     ROLLING_UPLOAD_TOKEN: ENCRYPTED[f935c396a9f4bca108ec2fdedb00dbc9be2f4c411f100d577acdab42db59ea134be059ce8535396db8222a2b1eb68c27]
   prepare_script:
     - brew update
+    - brew uninstall node@20
     - brew install git python@$PYTHON_VERSION python-setuptools
     - git submodule init
     - git submodule update
@@ -198,6 +199,7 @@ silicon_mac_task:
 #     - arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 #     - export PATH="/usr/local/bin:$PATH"
 #     - arch -x86_64 brew update
+#     - arch -x86_64 brew uninstall node@20
 #     - arch -x86_64 brew install node@16 git python@$PYTHON_VERSION python-setuptools
 #     - ln -s /usr/local/bin/python$PYTHON_VERSION /usr/local/bin/python
 #     - npm install -g yarn