Fixed CI on macOS

MasWag · May 29, 2024 · 3f83cfb · 3f83cfb
1 parent a13f548
commit 3f83cfb
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 9 deletions.
diff --git a/.github/workflows/boosttest.yml b/.github/workflows/boosttest.yml
@@ -99,8 +99,44 @@ jobs:
         mkdir -p build
         cd build && cmake .. && make unit_test && ./unit_test    
 
-  macOS_intel:
-    runs-on: macos-latest-large
+  macOS_Sonoma:
+    runs-on: macos-14
+    strategy:
+      max-parallel: 4
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install required packages
+      run: brew install eigen boost bison flex
+    - name: build and test
+      run: |
+        mkdir -p build
+        export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
+        LDFLAGS="-L/usr/local/opt/bison/lib -L/usr/local/opt/flex/lib"
+        export CPPFLAGS="-I/usr/local/opt/flex/include"
+        cd build && cmake .. && make unit_test && ./unit_test
+
+  macOS_Ventura:
+    runs-on: macos-13
+    strategy:
+      max-parallel: 4
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install required packages
+      run: brew install eigen boost bison flex
+    - name: build and test
+      run: |
+        mkdir -p build
+        export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
+        LDFLAGS="-L/usr/local/opt/bison/lib -L/usr/local/opt/flex/lib"
+        export CPPFLAGS="-I/usr/local/opt/flex/include"
+        cd build && cmake .. && make unit_test && ./unit_test
+
+  macOS_Monterey:
+    runs-on: macos-12
     strategy:
       max-parallel: 4
     steps:

diff --git a/.github/workflows/integrated_test.yml b/.github/workflows/integrated_test.yml
@@ -4,12 +4,27 @@ on:
   push:
 
 jobs:
-  ubuntu_bionic:
-    runs-on: ubuntu-18.04
+  ubuntu_noble:
+    runs-on: ubuntu-24.04
     strategy:
       max-parallel: 4
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install required packages
+      run: sudo apt-get install cmake bison libbison-dev flex libfl-dev libeigen3-dev libboost-all-dev -y
+    - name: build and test
+      run: |
+        mkdir -p build
+        cd build && cmake .. && make monaa && ../examples/integrated_test.sh
+
+  ubuntu_jammy:
+    runs-on: ubuntu-22.04
+    strategy:
+      max-parallel: 4
+    steps:
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install required packages
@@ -34,12 +49,12 @@ jobs:
         mkdir -p build
         cd build && cmake .. && make monaa && ../examples/integrated_test.sh
 
-  macOS_Catalina:
-    runs-on: macos-10.15
+  macOS_Sonoma:
+    runs-on: macos-14
     strategy:
       max-parallel: 4
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install required packages
@@ -51,3 +66,39 @@ jobs:
         LDFLAGS="-L/usr/local/opt/bison/lib -L/usr/local/opt/flex/lib"
         export CPPFLAGS="-I/usr/local/opt/flex/include"
         cd build && cmake .. && make monaa && ../examples/integrated_test.sh
+
+  macOS_Ventura:
+    runs-on: macos-13
+    strategy:
+      max-parallel: 4
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install required packages
+      run: brew install eigen boost bison flex
+    - name: build and test
+      run: |
+        mkdir -p build
+        export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
+        LDFLAGS="-L/usr/local/opt/bison/lib -L/usr/local/opt/flex/lib"
+        export CPPFLAGS="-I/usr/local/opt/flex/include"
+        cd build && cmake .. && make monaa && ../examples/integrated_test.sh
+
+  macOS_Monterey:
+    runs-on: macos-12
+    strategy:
+      max-parallel: 4
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install required packages
+      run: brew install eigen boost bison flex
+    - name: build and test
+      run: |
+        mkdir -p build
+        export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
+        LDFLAGS="-L/usr/local/opt/bison/lib -L/usr/local/opt/flex/lib"
+        export CPPFLAGS="-I/usr/local/opt/flex/include"
+        cd build && cmake .. && make monaa && ../examples/integrated_test.sh        
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Usage
 Installation
 ------------
 
-MONAA is tested on Arch Linux, Ubuntu (18.04 and 20.04), and macOS 10.15 Catalina. We also provide a [docker image](https://hub.docker.com/repository/docker/maswag/monaa).
+MONAA is tested on Arch Linux, Ubuntu (20.04, 22.04, 24.04), and macOS (12 Monterey, 13 Ventura, 14 Sonoma). We also provide a [docker image](https://hub.docker.com/repository/docker/maswag/monaa).
 
 ### Requirements