From 85f2c4a76f7b3d9aa2d966fe5c45fdcbf4ce8d2b Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Wed, 15 Feb 2023 00:38:18 -0800 Subject: [PATCH 1/2] Pin `python` brew installation to `3.10` --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 87ecfd8c6..df32a3482 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -133,7 +133,7 @@ intel_mac_task: - arch -x86_64 xcode-select --install - arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - export PATH="/usr/local/opt/node@16/bin:/usr/local/bin:$PATH" - - arch -x86_64 brew install node@16 yarn git python + - arch -x86_64 brew install node@16 yarn git python@3.10 - ln -s /usr/local/bin/python3 /usr/local/bin/python - git submodule init - git submodule update From 8717ad519bfa8f1c4f7c3e1b60b4c4e2d69cb83d Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Wed, 15 Feb 2023 16:46:35 -0800 Subject: [PATCH 2/2] Symlink to new python install location, pin MacOS Silicon install too, and add our python version as root environment variable --- .cirrus.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index df32a3482..09fd61cbb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,3 +1,6 @@ +env: + PYTHON_VERSION: 3.10 + linux_task: alias: linux container: @@ -99,10 +102,10 @@ silicon_mac_task: image: ghcr.io/cirruslabs/macos-monterey-base:latest memory: 8G test_script: - - brew install node@16 yarn git python + - brew install node@16 yarn git python@$PYTHON_VERSION - git submodule init - git submodule update - - ln -s /opt/homebrew/bin/python3 /opt/homebrew/bin/python + - ln -s /opt/homebrew/bin/python$PYTHON_VERSION /opt/homebrew/bin/python - export PATH="/opt/homebrew/bin:/opt/homebrew/opt/node@16/bin:$PATH" - sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json - yarn install || yarn install @@ -133,8 +136,8 @@ intel_mac_task: - arch -x86_64 xcode-select --install - arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - export PATH="/usr/local/opt/node@16/bin:/usr/local/bin:$PATH" - - arch -x86_64 brew install node@16 yarn git python@3.10 - - ln -s /usr/local/bin/python3 /usr/local/bin/python + - arch -x86_64 brew install node@16 yarn git python@$PYTHON_VERSION + - ln -s /usr/local/bin/python$PYTHON_VERSION /usr/local/bin/python - git submodule init - git submodule update - sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json