CMakePresets.json, macos-ci.yml, macos-release.yml: Undo a lot of my …

…macOS related changes, since they didn't work
vegastrike · Jan 8, 2025 · 80383f0 · 80383f0
1 parent 392bb60
commit 80383f0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 26 deletions.
diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     name: Build
     runs-on: ${{ matrix.os }}
-    continue-on-error: false
+    continue-on-error: true
 
     defaults:
       run:
@@ -22,20 +22,20 @@ jobs:
       matrix:
         os:
           - macos-13
-          #- macos-14
+          # - macos-14
         python-version:
-          - 3.12.8
+          # - 3.12.8
           - 3.13.1
         compiler:
           - AppleClang
           - clang
           - gcc
         homebrew-gl:
           - true
-          #- false
+          # - false
         homebrew-al:
           - true
-          #- false
+          # - false
         ENABLE_PIE:
           - 'ON'
 
@@ -56,7 +56,7 @@ jobs:
         id: vega-py-setup
         with:
           python-version: ${{ matrix.python-version }}
-          update-environment: false
+          update-environment: true # false
 
       - name: Install dependencies using homebrew
         run: brew install boost-python3 gtk+3 gtkglext sdl libvorbis
@@ -91,7 +91,7 @@ jobs:
         env:
           MY_OS_NAME: macos
           COMPILER:   ${{ matrix.compiler }}
-          FLAGS:      "-DCMAKE_FIND_FRAMEWORK=LAST -DENABLE_PIE=${{ matrix.ENABLE_PIE }} -DPython3_ROOT_DIR=${{ matrix.vega-py-setup.outputs.python-path }} -DPython3_FIND_STRATEGY=VERSION -DPython3_FIND_FRAMEWORK=LAST"
+          FLAGS:      "-DCMAKE_FIND_FRAMEWORK=LAST -DENABLE_PIE=${{ matrix.ENABLE_PIE }} -DPython3_ROOT_DIR=${{ matrix.vega-py-setup.outputs.python-path }}"
           OPENALDIR:  "$(brew --prefix)/opt/openal-soft"
           Python3_ROOT_DIR: ${{ matrix.vega-py-setup.outputs.python-path }}
           Python_ROOT_DIR: ${{ matrix.vega-py-setup.outputs.python-path }}

diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml
@@ -13,7 +13,6 @@ jobs:
   build:
     name: Build
     runs-on: ${{ matrix.os }}
-    continue-on-error: false
 
     defaults:
       run:
@@ -25,8 +24,12 @@ jobs:
         os:
           - macos-13
           # - macos-14
+        python-version:
+          # - 3.12.8
+          - 3.13.1
         compiler:
-          # - clang
+          - AppleClang
+          - clang
           - gcc
         homebrew-gl:
           - true
@@ -53,10 +56,8 @@ jobs:
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         id: vega-py-setup
         with:
-          python-version: |
-            3.13.1
-            3.12.8
-          update-environment: false
+          python-version: ${{ matrix.python-version }}
+          update-environment: true # false
 
       - name: Install dependencies using homebrew
         run: brew install boost-python3 gtk+3 gtkglext sdl libvorbis
@@ -96,9 +97,13 @@ jobs:
         env:
           MY_OS_NAME: macos
           COMPILER:   ${{ matrix.compiler }}
-          FLAGS:      "-DCMAKE_FIND_FRAMEWORK=LAST -DENABLE_PIE=${{ matrix.ENABLE_PIE }}"
+          FLAGS:      "-DCMAKE_FIND_FRAMEWORK=LAST -DENABLE_PIE=${{ matrix.ENABLE_PIE }} -DPython3_ROOT_DIR=${{ matrix.vega-py-setup.outputs.python-path }}"
           OPENALDIR:  "$(brew --prefix)/opt/openal-soft"
           Python3_ROOT_DIR: ${{ matrix.vega-py-setup.outputs.python-path }}
+          Python_ROOT_DIR: ${{ matrix.vega-py-setup.outputs.python-path }}
+          pythonLocation: ${{ matrix.vega-py-setup.outputs.python-path }}
+          PYTHONHOME: ""
+          PYTHONPATH: ""
           IS_RELEASE: 1
         run: script/cibuild $FLAGS
 

diff --git a/engine/CMakePresets.json b/engine/CMakePresets.json
@@ -275,15 +275,11 @@
         "rhs": "Darwin"
       },
       "environment": {
-        "VERBOSE": "ON",
-        "PYTHONHOME": "",
-        "PYTHONPATH": ""
+        "VERBOSE": "ON"
       },
       "cacheVariables": {
         "CMAKE_PREFIX_PATH": "/usr/local",
-        "CMAKE_FIND_FRAMEWORK": "LAST",
-        "Python3_FIND_STRATEGY": "VERSION",
-        "Python3_FIND_FRAMEWORK": "LAST"
+        "CMAKE_FIND_FRAMEWORK": "LAST"
       }
     },
     {
@@ -381,16 +377,12 @@
         "rhs": "Darwin"
       },
       "environment": {
-        "VERBOSE": "ON",
-        "PYTHONHOME": "",
-        "PYTHONPATH": ""
+        "VERBOSE": "ON"
       },
       "cacheVariables": {
         "CMAKE_PREFIX_PATH": "/opt/local",
         "Boost_INCLUDE_DIR": "/opt/local/libexec/boost/1.81/include",
-        "CMAKE_FIND_FRAMEWORK": "LAST",
-        "Python3_FIND_STRATEGY": "VERSION",
-        "Python3_FIND_FRAMEWORK": "LAST"
+        "CMAKE_FIND_FRAMEWORK": "LAST"
       }
     },
     {