ci: Add test for macOS universal build

getsentry · Apr 12, 2021 · e6b94df · e6b94df
1 parent be59aec
commit e6b94df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,6 +62,10 @@ jobs:
           - name: macOS (xcode llvm)
             os: macOs-latest
             ERROR_ON_WARNINGS: 1
+          - name: macOS (xcode llvm + universal)
+            os: macOs-latest
+            ERROR_ON_WARNINGS: 1
+            CMAKE_DEFINES: -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64
           - name: macOS (clang 11 + asan + llvm-cov)
             os: macOs-latest
             CC: clang
@@ -93,6 +97,7 @@ jobs:
       RUN_ANALYZER: ${{ matrix.RUN_ANALYZER }}
       ANDROID_API: ${{ matrix.ANDROID_API }}
       ANDROID_NDK: ${{ matrix.ANDROID_NDK }}
+      CMAKE_DEFINES: ${{ matrix.CMAKE_DEFINES }}
 
     steps:
       - uses: actions/checkout@v2

diff --git a/tests/cmake.py b/tests/cmake.py
@@ -145,6 +145,8 @@ def cmake(cwd, targets, options=None):
         flags = "-fprofile-instr-generate -fcoverage-mapping"
         configcmd.append("-DCMAKE_C_FLAGS='{}'".format(flags))
         configcmd.append("-DCMAKE_CXX_FLAGS='{}'".format(flags))
+    if "CMAKE_DEFINES" in os.environ:
+        configcmd.extend(os.environ.get("CMAKE_DEFINES").split())
     env = dict(os.environ)
     env["CFLAGS"] = env["CXXFLAGS"] = " ".join(cflags)