Fix MacOS CI

OCamlPro · May 13, 2024 · b157ae1 · b157ae1
1 parent 5ba97ae
commit b157ae1
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -26,15 +26,11 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install automake help2man texinfo bison berkeley-db@4
-          opt="/usr/local/opt"; \
-          for d in automake help2man bison texinfo berkeley-db@4; do \
-            test -d "$opt/$d/bin" && echo "$opt/$d/bin" >> $GITHUB_PATH; \
-            test -d "$opt/$d/lib" && export LDFLAGS="-L$opt/$d/lib $LDFLAGS"; \
-            test -d "$opt/$d/include" && export CPPFLAGS="-I$opt/$d/include $CPPFLAGS"; \
-          done; \
-          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV; \
-          echo "CPPFLAGS=${CPPFLAGS}" >> $GITHUB_ENV
+          brew install pkg-config automake libtool help2man texinfo bison berkeley-db@4 json-c
+          opt="/opt/homebrew/opt"
+          echo "$opt/pkg-config/bin" >> $GITHUB_PATH
+          echo "LDFLAGS=-L$opt/berkeley-db@4/lib ${LDFLAGS}" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$opt/berkeley-db@4/include ${CPPFLAGS}" >> $GITHUB_ENV
 
       - name: Set git user
         run: |
@@ -53,18 +49,18 @@ jobs:
           echo "NPROC=`sysctl -n hw.ncpu`" >> $GITHUB_ENV
           export TERM="vt100"
           echo "TERM=$TERM" >> $GITHUB_ENV
-
       - name: configure
         run: |
           cd _build
           ../configure --enable-cobc-internal-checks --enable-hardening --prefix /opt/cobol/gnucobol-gcos --exec-prefix /opt/cobol/gnucobol-gcos
+          sed -i '' 's/-undefined suppress//g' config.h
 
       - name: Upload config.log
         uses: actions/upload-artifact@v3
         with:
           name: config.log
           path: _build/config.log
-#       if: failure()
+        if: failure()
 
       - name: make
         run: |