Continue debug - change distutils fallback

s0600204 · Jan 26, 2024 · 9581281 · 9581281
1 parent 1d1b5c8
commit 9581281
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/.github/workflows/lockfile.yml b/.github/workflows/lockfile.yml
@@ -24,7 +24,7 @@ jobs:
       # According to MSys2's list of known issues (https://www.msys2.org/docs/python/#known-issues),
       # setuptools >= 60.0 is not compatible with MSys2 (or vice-versa).
       # `SETUPTOOLS_USE_DISTUTILS=stdlib` is the recommended work-around.
-      SETUPTOOLS_USE_DISTUTILS: stdlib
+      SETUPTOOLS_USE_DISTUTILS: ${{ matrix.sys.distutils }}
 
     defaults:
       run:
@@ -34,12 +34,15 @@ jobs:
       fail-fast: false
       matrix:
         sys:
-        #~ - os: windows-latest
-          #~ shell: msys2 {0}
-        #~ - os: ubuntu-latest
-          #~ shell: bash
+        - os: windows-latest
+          shell: msys2 {0}
+          distutils: stdlib
+        - os: ubuntu-latest
+          shell: bash
+          distutils: local
         - os: macos-latest
           shell: bash
+          distutils: local
 
         poetVers:
         - 1.7.1
@@ -81,12 +84,6 @@ jobs:
           qt5-svg:p
           rtmidi:p
 
-    - name: Add pip to $PATH
-      if: ${{ startsWith(matrix.sys.os, 'macos') }}
-      run: |
-        which -a pip3
-        which -a python3
-
     - name: Update pip
       run: |
         python3 -m pip install -U pip
@@ -105,8 +102,6 @@ jobs:
 
     - name: Install Poetry via pip
       run: |
-        PATH=/Library/Frameworks/Python.framework/Versions/3.12/bin:${PATH}
-        export PATH
         python3 -m pip install poetry==${{ matrix.poetVers }}
         python3 -m pip list | grep poetry