Skip to content

Commit

Permalink
Fix node-gyp building on MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
rubensworks committed Aug 29, 2024
1 parent fcb86bc commit 732d2ab
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
"OTHER_CFLAGS": [
"-stdlib=libc++",
"-Wno-register"
"-Wno-register",
"-std=c++23",
],
},
},
Expand Down
2 changes: 1 addition & 1 deletion deps
Submodule deps updated 61 files
+6 −0 .dockerignore
+3 −0 .gitignore
+1 −2 .travis.yml
+53 −34 Dockerfile
+53 −3 README.md
+1 −1 configure.ac
+1 −1 libcds/include/libcdsTrees.h
+1 −2 libcds/src/static/coders/huff.cpp
+0 −1 libcds/src/static/sequence/SequenceAlphPart.cpp
+0 −2 libcds/src/static/sequence/SequenceGMRChunk.cpp
+2 −2 libcds/src/static/sequence/wt_coder_huff.cpp
+0 −1 libcds/src/static/suffixtree/LCP_PT.cpp
+1 −1 libcds/src/static/suffixtree/RMQ_succinct.cpp
+1 −1 libcds/src/static/suffixtree/RMQ_succinct_lcp.cpp
+3 −22 libcds/src/static/suffixtree/factorization.cpp
+3 −3 libcds/src/static/suffixtree/factorization_var.cpp
+45 −34 libcds/src/static/textindex/suftest3.test.cpp
+1 −0 libhdt/Makefile.am
+7 −0 libhdt/include/HDTSpecification.hpp
+15 −5 libhdt/include/SingleTriple.hpp
+24 −0 libhdt/src/bitsequence/BitSequence375.cpp
+1 −4 libhdt/src/dictionary/FourSectionDictionary.cpp
+1 −4 libhdt/src/dictionary/KyotoDictionary.cpp
+2 −4 libhdt/src/dictionary/LiteralDictionary.cpp
+1 −4 libhdt/src/dictionary/PlainDictionary.cpp
+1 −35 libhdt/src/dictionary/PlainDictionary.hpp
+8 −29 libhdt/src/hdt/BasicHDT.cpp
+5 −7 libhdt/src/hdt/BasicModifiableHDT.cpp
+24 −1 libhdt/src/hdt/HDTSpecification.cpp
+1 −2 libhdt/src/huffman/huff.cpp
+34 −40 libhdt/src/libdcs/CSD.cpp
+55 −53 libhdt/src/libdcs/CSD.h
+35 −51 libhdt/src/libdcs/CSD_Cache.cpp
+77 −77 libhdt/src/libdcs/CSD_Cache.h
+34 −49 libhdt/src/libdcs/CSD_Cache2.cpp
+76 −76 libhdt/src/libdcs/CSD_Cache2.h
+355 −349 libhdt/src/libdcs/CSD_FMIndex.cpp
+104 −97 libhdt/src/libdcs/CSD_FMIndex.h
+673 −707 libhdt/src/libdcs/CSD_HTFC.cpp
+167 −164 libhdt/src/libdcs/CSD_HTFC.h
+450 −471 libhdt/src/libdcs/CSD_PFC.cpp
+375 −379 libhdt/src/libdcs/CSD_PFC.h
+107 −105 libhdt/src/libdcs/VByte.cpp
+30 −33 libhdt/src/libdcs/VByte.h
+369 −373 libhdt/src/libdcs/fmindex/SSA.cpp
+66 −65 libhdt/src/libdcs/fmindex/SSA.h
+344 −345 libhdt/src/libdcs/fmindex/SuffixArray.cpp
+54 −51 libhdt/src/libdcs/fmindex/SuffixArray.h
+75 −81 libhdt/src/libdcs/hutucker/binarynode.h
+183 −190 libhdt/src/libdcs/hutucker/hutucker.h
+1 −1 libhdt/src/sequence/HuffmanSequence.cpp
+8 −21 libhdt/src/triples/BitmapTriples.cpp
+10 −20 libhdt/src/triples/PlainTriples.cpp
+2 −4 libhdt/src/triples/TriplesKyoto.cpp
+6 −6 libhdt/src/util/bitutil.h
+2 −1 libhdt/tests/Makefile.am
+38 −0 libhdt/tests/README.md
+194 −0 libhdt/tests/dumpDictionary.cpp
+442 −22 m4/ax_cxx_compile_stdcxx.m4
+4 −4 m4/ax_cxx_compile_stdcxx_11.m4
+2 −2 m4/ax_require_defined.m4

0 comments on commit 732d2ab

Please sign in to comment.