Skip to content

Commit 3071a8d

Browse files
committed
Fix CI dependency conflict and libgomp path on Ubuntu
- Add --update-invariant to opam install for flambda compatibility - Add Ubuntu x86_64 path for libgomp.a in dune rule
1 parent c21bdd8 commit 3071a8d

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: |
2626
sudo apt-get update
2727
sudo apt-get install -y npm xz-utils libomp-dev llvm-dev
28-
opam install . --deps-only
28+
opam install . --deps-only --update-invariant
2929
npm install --no-save typescript browserify pug-lexer pug-parser pug-walk
3030
3131
- name: Install QuickJS

src/quickjs/dune

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
(action (bash "
5656
cp /usr/local/Cellar/libomp/17.0.6/lib/libomp.a . &> /dev/null \
5757
|| cp /usr/lib/libgomp.a libomp.a &> /dev/null \
58+
|| cp /usr/lib/gcc/x86_64-linux-gnu/*/libgomp.a libomp.a &> /dev/null \
5859
|| cp /usr/lib/gcc/aarch64-redhat-linux/15/libgomp.a libomp.a
5960
"))
6061
(mode standard)

0 commit comments

Comments
 (0)