ci: use macos-13 in publish-python to fix missing c++20 support

axxel · Feb 24, 2024 · 0b49343 · 0b49343
1 parent 6741403
commit 0b49343
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/publish-python.yml b/.github/workflows/publish-python.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest] # at least macos-13 is required to enable c++20 support
 
     steps:
     - uses: actions/checkout@v4
@@ -50,7 +50,7 @@ jobs:
         CIBW_ARCHS_MACOS: universal2
         CIBW_ENVIRONMENT_MACOS: CMAKE_OSX_ARCHITECTURES="arm64;x86_64"
         # the default macOS target version is 10.9 which does not support c++20 coroutines
-        MACOSX_DEPLOYMENT_TARGET: "10.15"
+#        MACOSX_DEPLOYMENT_TARGET: "10.13"
         CIBW_BUILD_VERBOSITY: 1
 
     - name: Upload wheels

diff --git a/core/src/datamatrix/DMDetector.cpp b/core/src/datamatrix/DMDetector.cpp
@@ -944,7 +944,7 @@ DetectorResults Detect(const BitMatrix& image, bool tryHarder, bool tryRotate, b
 		}
 	}
 #else
-	auto result = DetectPure(image);
+	auto result = DetectPure_(image);
 	if (!result.isValid() && !isPure)
 		result = DetectNew(image, tryHarder, tryRotate);
 	if (!result.isValid() && tryHarder && !isPure)