Skip to content

Commit 26db35e

Browse files
committed
fix(ci): reenable macOS CI by disabling modules
1 parent 4c94d19 commit 26db35e

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

.github/workflows/macos.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: macOS
22

3-
# Turning off macOS CI build since Apple Clang doesn't support C++20 modules
4-
#on: [push, pull_request]
5-
on: [pull_request]
3+
on: [push, pull_request]
64

75
jobs:
86
xcode:
@@ -19,8 +17,6 @@ jobs:
1917
submodules: true
2018
fetch-depth: 0
2119

22-
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401
23-
2420
- name: Cache vcpkg
2521
uses: actions/cache@v4.0.2
2622
id: cache-vcpkg
@@ -54,8 +50,7 @@ jobs:
5450
$cacheAccess = $(if ('${{ steps.cache-vcpkg.outputs.cache-hit }}' -eq 'true') { 'read' } else { 'write' })
5551
$env:VCPKG_BINARY_SOURCES = "clear;files,$cachedBinaries,$cacheAccess"
5652
57-
$env:PATH = "${env:PATH}:${{ github.workspace }}/ninja-build"
58-
cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" -G Ninja ${{ github.workspace }}
53+
cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" "-DGRAPHQL_BUILD_MODULES=OFF" ${{ github.workspace }}
5954
6055
- name: Build
6156
working-directory: build/

0 commit comments

Comments
 (0)