Fix CI (#270)

simsong · Dec 19, 2024 · 0b480fb · 0b480fb
1 parent 45b6033
commit 0b480fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 53 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['macos-latest', 'ubuntu-22.04']
+        os: ['macos-latest', 'ubuntu-latest']
 
     steps:
       # https://github.com/actions/checkout
@@ -29,7 +29,11 @@ jobs:
       - name: Install C++ dependencies on MacOS
         if: startsWith(matrix.os, 'macOS')
         run: |
-           bash etc/install_autotools.sh
+           brew install libtool autoconf automake boost openssl libpcap
+           echo LDFLAGS="-L$(brew --prefix libpcap)/lib -L$(brew --prefix openssl)/lib -L$(brew --prefix boost)/lib" >> $GITHUB_ENV
+           echo CFLAGS="-I$(brew --prefix libpcap)/include -I$(brew --prefix openssl)/include -I$(brew --prefix boost)/include" >> $GITHUB_ENV
+           echo CXXFLAGS="-I$(brew --prefix libpcap)/include -I$(brew --prefix openssl)/include -I$(brew --prefix boost)/include" >> $GITHUB_ENV
+           echo PKG_CONFIG_PATH="$(brew --prefix libpcap)/pkgconfig:$(brew --prefix openssl)/lib/pkgconfig" >> $GITHUB_ENV
 
       - name: Install C++ dependencies on Ubuntu
         if: startsWith(matrix.os, 'ubuntu')

diff --git a/etc/install_autotools.sh b/etc/install_autotools.sh