From 15112ae87bc74c1d3a1c95e9d0680acbadf26aae Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Thu, 3 Nov 2022 11:59:25 +0100
Subject: [PATCH] gci: Force MacOS CI Job to use python 3.10

The runner version was recently bumped causing our tests to fail
because it couldn't find the `poetry` version it just installed. We
instead install python3.10, and force its use, since otherwise we end
up compiling grpcio and fail to do so.

Changelog-None
---
 .github/workflows/macos.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index 58ba7bae5..bb8157bcf 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -20,8 +20,9 @@ jobs:
       - name: Install dependencies
         run: |
           export PATH="/usr/local/opt:/Users/runner/.local/bin:/Users/runner/Library/Python/3.10/bin:$PATH"
+
           export BITCOIN_VERSION=0.20.1
-          brew install wget python autoconf automake libtool python3 gmp gnu-sed gettext libsodium
+          brew install wget autoconf automake libtool python@3.10 gmp gnu-sed gettext libsodium
 
           (
             cd /tmp/
@@ -30,12 +31,11 @@ jobs:
             sudo mv bitcoin-$BITCOIN_VERSION/bin/* /usr/local/bin
           )
 
-          pip3 install --user poetry
-          poetry config virtualenvs.create false --local
-          poetry install
+          python3.10 -m pip install -U --user poetry wheel pip
+          python3.10 -m poetry install
+          python3.10 -m pip install -U --user mako
           
           ln -s /usr/local/Cellar/gettext/0.20.1/bin/xgettext /usr/local/opt
-          export PATH="/usr/local/opt:$PATH"
 
       - name: Build
         env:
@@ -53,7 +53,7 @@ jobs:
           TEST_GROUP_COUNT: ${{ matrix.TEST_GROUP_COUNT }}
           TEST_GROUP: ${{ matrix.TEST_GROUP }}
         run: |
-          export PATH="/usr/local/opt:/Users/runner/.local/bin:/Users/runner/Library/Python/3.10/bin:$PATH"
+          export PATH="/usr/local/opt:/Users/runner/.local/bin:/Users/runner/Library/Python/3.10/bin:/usr/local/opt:$PATH"
           export LDFLAGS="-L/usr/local/opt/sqlite/lib"
           export CPPFLAGS="-I/usr/local/opt/sqlite/include"
 
@@ -64,5 +64,5 @@ jobs:
               slow_test: marks tests as slow (deselect with '-m "not slow_test"')
           EOF
 
-          ./configure
-          make
+          python3.10 -m poetry run ./configure
+          python3.10 -m poetry run make