From 34851a3089bf315c5155d2e9cb9d641ecb1c4515 Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Thu, 19 Oct 2023 16:37:51 -0700 Subject: [PATCH 1/3] Pin Python to `3.11.5` on all platforms --- .cirrus.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f7159e7a55..362e060c94 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ env: - PYTHON_VERSION: 3.10 + PYTHON_VERSION: 3.11.5 GITHUB_TOKEN: ENCRYPTED[!b0ff4671044672be50914a3a10b49af642bd8e0e681a6f4e5855ec5230a5cf9afbc53d9e90239b8d2c79455f014f383f!] # The above token, is a GitHub API Token, that allows us to download RipGrep without concern of API limits diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fc3b96a20..03e66be0e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: env: # Variables needed for build information GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PYTHON_VERSION: '3.11' + PYTHON_VERSION: '3.11.5' NODE_VERSION: 16 ROLLING_UPLOAD_TOKEN: ${{ secrets.ROLLING_RELEASE_UPLOAD_TOKEN }} # Below variables allow us to quickly control visual tests for each platform From 48fca3c07512d3a9882704dc80838bd529ea124d Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Thu, 19 Oct 2023 17:06:54 -0700 Subject: [PATCH 2/3] Pinning didn't work, instead install `setuptools` on latest Python --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03e66be0e7..0035945834 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: env: # Variables needed for build information GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PYTHON_VERSION: '3.11.5' + PYTHON_VERSION: '3.12' NODE_VERSION: 16 ROLLING_UPLOAD_TOKEN: ${{ secrets.ROLLING_RELEASE_UPLOAD_TOKEN }} # Below variables allow us to quickly control visual tests for each platform @@ -40,6 +40,9 @@ jobs: with: python-version: ${{ env.PYTHON_VERSION }} + - name: Install Python Packages + run: python3 -m pip install setuptools + - name: Setup Git Submodule run: | git submodule init From 98a65b04c8aec2d9fab11f0a1115e5a079fdd49d Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Thu, 19 Oct 2023 18:02:10 -0700 Subject: [PATCH 3/3] Install `setuptools` on all platforms --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 362e060c94..3bf5c134e1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ env: - PYTHON_VERSION: 3.11.5 + PYTHON_VERSION: 3.12 GITHUB_TOKEN: ENCRYPTED[!b0ff4671044672be50914a3a10b49af642bd8e0e681a6f4e5855ec5230a5cf9afbc53d9e90239b8d2c79455f014f383f!] # The above token, is a GitHub API Token, that allows us to download RipGrep without concern of API limits @@ -86,6 +86,7 @@ arm_linux_task: libnss3 xvfb - gem install fpm + - python3 -m pip install setuptools - git submodule init - git submodule update - sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json @@ -133,6 +134,7 @@ silicon_mac_task: ROLLING_UPLOAD_TOKEN: ENCRYPTED[690950798401ec3715e9d20ac29a0859d3c58097038081ff6afeaf4721e661672d34eb952d8a6442bc7410821ab8545a] prepare_script: - brew install node@16 yarn git python@$PYTHON_VERSION + - python3 -m pip install setuptools - git submodule init - git submodule update - ln -s /opt/homebrew/bin/python$PYTHON_VERSION /opt/homebrew/bin/python