ci: macos install_name_tool

kojix2 · Aug 23, 2024 · 6849ec6 · 6849ec6
1 parent 15f8a84
commit 6849ec6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ jobs:
     name: ${{ matrix.os }} Ruby ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}-latest
     strategy:
+      fail-fast: false
       matrix:
         os: ["ubuntu", "macos"]
         ruby: ["3.3"]
@@ -16,15 +17,19 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - if: matrix.os == 'ubuntu'
-        run: sudo apt-get update -yq && sudo apt upgrade -yq # && sudo apt-get upgrade libjemalloc-dev
       - if: matrix.os == 'macos'
         run: brew update && brew install llvm libomp autoconf #jemalloc
       - if: matrix.os == 'ubuntu'
         run: bundle exec rake jemalloc:build && bundle exec rake odgi:build
       - if: matrix.os == 'macos'
         run: |
           CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ LDFLAGS=-L/opt/homebrew/lib bundle exec rake jemalloc:build
-          CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ LDFLAGS=-L/opt/homebrew/lib bundle exec rake jemalloc:build
+          CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ LDFLAGS=-L/opt/homebrew/lib bundle exec rake odgi:build
       - run: bundle exec rake compile
+      - if: matrix.os == 'macos'
+        run: |
+          otool -L lib/odgi/odgi.bundle
+          otool -L odgi/lib/libodgi.dylib
+          install_name_tool -change "@rpath/libodgi.dylib" $(pwd)/odgi/lib/libodgi.dylib lib/odgi/odgi.bundle # FIXME: this is a hack
+          otool -L lib/odgi/odgi.bundle
       - run: bundle exec rake test
diff --git a/ext/odgi/extconf.rb b/ext/odgi/extconf.rb
@@ -34,10 +34,6 @@
   find_header 'dynamic.hpp', dir
 end
 
-(ODGI_DIR / 'src').tap do |dir|
-  find_header 'atomic_bitvector.hpp', dir
-end
-
 (ODGI_DIR / 'deps/sparsepp/sparsepp').tap do |dir|
   find_header 'spp.h', dir
 end