From 2bd9332558bbcfaccda0cc5cd0353077f43d78ca Mon Sep 17 00:00:00 2001
From: Zeid Zabaneh <zeid@mozilla.com>
Date: Thu, 28 Sep 2023 11:08:47 -0400
Subject: [PATCH] requirements: pin universal2 binaries for PyInstaller (bug
 1855547)

---
 .github/workflows/compile-requirements.yml     |  2 +-
 .github/workflows/run-compile-requirements.yml |  6 +++---
 requirements/base.in                           |  8 ++------
 requirements/base.universal2.in                | 10 ++++++++++
 4 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 requirements/base.universal2.in

diff --git a/.github/workflows/compile-requirements.yml b/.github/workflows/compile-requirements.yml
index 7a17e6f1a..9225fbf0e 100644
--- a/.github/workflows/compile-requirements.yml
+++ b/.github/workflows/compile-requirements.yml
@@ -78,5 +78,5 @@ jobs:
           git pull --rebase
           find temp-requirements -name "requirements-*" -type f -exec mv -f -t requirements {} +
           git add -A
-          git commit -m "Automatically generated requirements"
+          until git commit -m "Automatically generated requirements"; do git pull --rebase; done
           until git push -f https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git; do git pull --rebase; done
diff --git a/.github/workflows/run-compile-requirements.yml b/.github/workflows/run-compile-requirements.yml
index e4d1846f9..fdd1c1ded 100644
--- a/.github/workflows/run-compile-requirements.yml
+++ b/.github/workflows/run-compile-requirements.yml
@@ -11,20 +11,20 @@ jobs:
   call-compile-requirements-linux:
     uses: ./.github/workflows/compile-requirements.yml
     with:
-      requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
+      requirements_files: '["base.in base.universal2.in dev.in gui-dev.in gui.in linters.in"]'
       os: '["ubuntu-latest"]'
       python: '["3.8", "3.9", "3.10", "3.11"]'
 
   call-compile-requirements-windows:
     uses: ./.github/workflows/compile-requirements.yml
     with:
-      requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
+      requirements_files: '["base.in base.universal2.in dev.in gui-dev.in gui.in linters.in"]'
       os: '["windows-latest"]'
       python: '["3.9", "3.10", "3.11"]'
 
   call-compile-requirements-macos:
     uses: ./.github/workflows/compile-requirements.yml
     with:
-      requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
+      requirements_files: '["base.in base.universal2.in dev.in gui-dev.in gui.in linters.in"]'
       os: '["macos-latest"]'
       python: '["3.9", "3.10", "3.11"]'
diff --git a/requirements/base.in b/requirements/base.in
index 8b69f3c2f..136b32676 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -6,12 +6,8 @@ colorama>=0.4.1
 configobj>=5.0.6
 distro>=1.8.0
 dmgbuild==1.*
-glean-sdk==53.0.0; sys.platform != 'darwin'
-# See https://github.com/pypa/pip/issues/11573.
-https://files.pythonhosted.org/packages/d2/eb/c6a4269ff5f293274d736bd99f40c8e3d47c989a3e2eeabb78677cb785ed/glean_sdk-53.0.0-cp36-abi3-macosx_10_7_universal2.whl; sys.platform == 'darwin'
+glean-sdk==54.0.0; sys.platform != 'darwin'
 importlib-metadata==6.8.0
-# Pinned on darwin because later versions depend on a package that has no universal2 binary.
-jsonschema==4.17.3; sys.platform == 'darwin'
 mozdevice>=4.1.0,<5
 mozfile>=2.0.0
 mozinfo>=1.1.0
@@ -21,9 +17,9 @@ mozprocess>=1.3.1
 mozprofile>=2.2.0
 mozrunner>=8.0.2
 mozversion>=2.1.0
+pyyaml==6.*
 redo>=2.0.2
 requests>=2.21.0
 setuptools
 setuptools_scm==8.*
 taskcluster>=6.0.0
-pyyaml==6.*
diff --git a/requirements/base.universal2.in b/requirements/base.universal2.in
new file mode 100644
index 000000000..2c680bb28
--- /dev/null
+++ b/requirements/base.universal2.in
@@ -0,0 +1,10 @@
+# See https://github.com/pypa/pip/issues/11573.
+
+https://files.pythonhosted.org/packages/4e/56/3bd3f99304be831d798ec3bc424dabc2dac09cb408f37800b29cc96e8eee/aiohttp-3.8.5-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin'
+https://files.pythonhosted.org/packages/6d/6f/86f2c5e34909e72fcbb28d6d27b405b5a685ed7892df3979f83b7a1b2d04/frozenlist-1.4.0-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin'
+https://files.pythonhosted.org/packages/bb/e4/ea5687129b0cb781aba596bd08abb2aca3c8051e41aabf989c966e93af04/multidict-6.0.4-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin'
+https://files.pythonhosted.org/packages/2e/2d/09acfde2661ef63aa1400554163117dee88d70dd7bac65585f5641fef953/glean_sdk-54.0.0-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl; sys.platform == 'darwin'
+https://files.pythonhosted.org/packages/eb/cb/4970008c85810c7d0e154ac5d746451b04476ac1dd85dc538563a1c04698/yarl-1.9.2-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin'
+
+# Pinned on darwin because later versions depend on a package that has no universal2 binary.
+jsonschema==4.17.3; sys.platform == 'darwin'