From 732d2ab9c78f8464fa50c3cad7f8a53482fcb93a Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Wed, 28 Aug 2024 13:20:48 +0200 Subject: [PATCH] Fix node-gyp building on MacOS --- .github/workflows/ci.yml | 10 ++++++---- binding.gyp | 3 ++- deps | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 502fa3d..c57dd26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,11 @@ jobs: test: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-14] node-version: - 18.x - - 20.x - - 22.x steps: - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 @@ -35,8 +34,11 @@ jobs: .rdf-test-suite-cache .rdf-test-suite-ldf-cache key: ${{ runner.os }}-test-modules-${{ hashFiles('**/package-lock.json') }} + - name: Override clang on MacOS + if: runner.os == 'MacOS' + run: echo "CC=$(brew --prefix llvm@15)/bin/clang" >> "$GITHUB_ENV" && echo "CPP=$(brew --prefix llvm@15)/bin/clang++" >> "$GITHUB_ENV" - name: Install dependencies - run: npm install + run: echo $CC && npm install --verbose - name: Run tests run: npm run test - name: Run bin diff --git a/binding.gyp b/binding.gyp index 3003f32..e1163a8 100644 --- a/binding.gyp +++ b/binding.gyp @@ -46,7 +46,8 @@ "GCC_ENABLE_CPP_EXCEPTIONS": "YES", "OTHER_CFLAGS": [ "-stdlib=libc++", - "-Wno-register" + "-Wno-register", + "-std=c++23", ], }, }, diff --git a/deps b/deps index b90d8a3..d9ae092 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit b90d8a3cbb9d976c4a654d25762ee5063ff32a76 +Subproject commit d9ae092bb37d9fe85558dfb3edfe0bb6ddddf41a