Merge pull request #1520 from dpogue/host-python2

Enable macOS arm64 builds in CI
H-uru · Nov 8, 2023 · 4247e4b · 4247e4b
2 parents 1c4209c + 5b76aa0
commit 4247e4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -248,7 +248,7 @@ jobs:
     strategy:
       matrix:
         platform:
-          #- { str: macos-arm64, arch: arm64 }
+          - { str: macos-arm64, arch: arm64 }
           - { str: macos-x64, arch: x86_64 }
         cfg:
           - { external: OFF, type: RelWithDebInfo, str: internal-release }
@@ -262,11 +262,11 @@ jobs:
       - name: Install dependencies
         run: |
           brew install \
+              ${{ (matrix.platform.arch == 'x86_64' && 'qt@5') || '' }} \
               autoconf \
               automake \
               libtool \
-              nasm \
-              qt@5
+              nasm
 
       - name: Setup NuGet
         run: |
@@ -303,6 +303,7 @@ jobs:
           cmake --build build --config "${{ matrix.cfg.type }}" -j 2
 
       - name: Test
+        if: matrix.platform.arch == 'x86_64'
         run: |
           cmake --build build --target check --config "${{ matrix.cfg.type }}" -j 2
 

diff --git a/Scripts/Ports/python3/vcpkg-cmake-wrapper.cmake b/Scripts/Ports/python3/vcpkg-cmake-wrapper.cmake
@@ -59,7 +59,7 @@ if(_PythonFinder_WantLibs)
         find_program(
             @PythonFinder_PREFIX@_EXECUTABLE
             NAMES "python" "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@"
-            PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3"
+            PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools/python3"
             NO_DEFAULT_PATH
         )
     endif()

diff --git a/Scripts/Ports/python3/vcpkg.json b/Scripts/Ports/python3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "python3",
   "version": "3.10.7",
-  "port-version": 7,
+  "port-version": 8,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "license": "Python-2.0",