Optimize ci and fix ci on macOS

Author: xiaozhuai

.github/workflows/ci-meson.yml

@@ -1,4 +1,4 @@
-name: Makefile Continuous Integrations
+name: Continuous Integrations
 
 on:
   push:
@@ -8,45 +8,131 @@ on:
       - '**.h'
       - '**.cc'
       - Makefile
+      - 'meson*'
+      - '**/CMakeLists.txt'
       - .github/workflows/ci.yml
   pull_request:
-    branches: [ master ]
+    branches: [ master]
     paths:
       - '!**'
       - '**.h'
       - '**.cc'
       - Makefile
+      - 'meson*'
+      - '**/CMakeLists.txt'
       - .github/workflows/ci.yml
 
 jobs:
-  unit-test:
+  ci-linux:
     strategy:
       fail-fast: false
       matrix:
-        toolset: [gcc, clang]
         os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm]
+        compiler: 
+          - {c: gcc, cpp: g++}
+          - {c: clang, cpp: clang++}
+        sanitize: [address, undefined, thread]
+        build_system: [cmake, meson]
+    
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
 
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes -qq meson libboost-all-dev
+
+      - name: Build and test with CMake
+        if: matrix.build_system == 'cmake'
+        env:
+          CC: ${{ matrix.compiler.c }}
+          CXX: ${{ matrix.compiler.cpp }}
+        run: |
+          cmake -S . -G Ninja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_INIT="-fsanitize=${{ matrix.sanitize }}" -DCMAKE_CXX_FLAGS_INIT="-fsanitize=${{ matrix.sanitize }}" -DCMAKE_EXE_LINKER_FLAGS_INIT="-fsanitize=${{ matrix.sanitize }}" -DATOMIC_QUEUE_BUILD_TESTS=ON -DATOMIC_QUEUE_BUILD_EXAMPLES=ON
+          cmake --build build --target all
+          ctest --test-dir build --output-on-failure
+
+      - name: Build and test with Meson
+        if: matrix.build_system == 'meson'
+        env:
+          CC: ${{ matrix.compiler.c }}
+          CXX: ${{ matrix.compiler.cpp }}
+        run: |
+          meson setup build -Dwerror=true -Dwarning_level=3 -Db_sanitize=${{ matrix.sanitize }}
+          meson compile -C build
+          meson test -C build --print-errorlogs
+
+  ci-macos:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest]
+        compiler: 
+          - {c: clang, cpp: clang++}
+        sanitize: [address, undefined, thread]
+        build_system: [cmake, meson]
+    
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v6
+      - name: Checkout code
+        uses: actions/checkout@v6
 
-    - name: Install Boost.Test
-      run: |
-        sudo apt-get update
-        sudo apt-get install --yes -qq libboost-test-dev
+      - name: Install dependencies
+        run: |
+          brew install meson boost
 
-    - name: Environment variables
-      run: make -r TOOLSET=${{ matrix.toolset }} env
+      - name: Build and test with CMake
+        if: matrix.build_system == 'cmake'
+        env:
+          CC: ${{ matrix.compiler.c }}
+          CXX: ${{ matrix.compiler.cpp }}
+        run: |
+          cmake -S . -G Ninja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_INIT="-fsanitize=${{ matrix.sanitize }}" -DCMAKE_CXX_FLAGS_INIT="-fsanitize=${{ matrix.sanitize }}" -DCMAKE_EXE_LINKER_FLAGS_INIT="-fsanitize=${{ matrix.sanitize }}" -DATOMIC_QUEUE_BUILD_TESTS=ON -DATOMIC_QUEUE_BUILD_EXAMPLES=ON
+          cmake --build build --target all
+          ctest --test-dir build --output-on-failure
 
-    - name: Toolset versions
-      run: make -r TOOLSET=${{ matrix.toolset }} versions
+      - name: Build and test with Meson
+        if: matrix.build_system == 'meson'
+        env:
+          CC: ${{ matrix.compiler.c }}
+          CXX: ${{ matrix.compiler.cpp }}
+        run: |
+          meson setup build -Dwerror=true -Dwarning_level=3 -Db_sanitize=${{ matrix.sanitize }}
+          meson compile -C build
+          meson test -C build --print-errorlogs
+
+  ci-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest]
+        build_system: [cmake]
+    
+    runs-on: ${{ matrix.os }}
 
-    - name: Build and run unit tests
-      run: make -rj2 TOOLSET=${{ matrix.toolset }} example run_tests
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
 
-    - name: Build and run unit tests with address sanitizer
-      run: make -rj2 TOOLSET=${{ matrix.toolset }} BUILD=sanitize2 run_tests
+      - name: Install meson
+        run: |
+          pip install meson
+      
+      - name: Install boost
+        uses: MarkusJx/install-boost@v2.6.0
+        id: install-boost-windows
+        with:
+          boost_version: 1.89.0
+          platform_version: 2022
+          toolset: msvc
 
-    - name: Build and run unit tests with thread sanitizer
-      run: make -rj2 TOOLSET=${{ matrix.toolset }} BUILD=sanitize run_tests
+      - name: Build and test with CMake
+        if: matrix.build_system == 'cmake'
+        run: |
+          cmake -S . -G Ninja -B build -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT="${{steps.install-boost-windows.outputs.BOOST_ROOT}}" -DATOMIC_QUEUE_BUILD_TESTS=ON -DATOMIC_QUEUE_BUILD_EXAMPLES=ON
+          cmake --build build --target all
+          ctest --test-dir build --output-on-failure

.github/workflows/ci.yml

@@ -272,8 +272,9 @@ BOOST_AUTO_TEST_CASE(try_push_pop) {
 }
 
 BOOST_AUTO_TEST_CASE(size) {
+    constexpr unsigned CAPACITY = CACHE_LINE_SIZE * CACHE_LINE_SIZE;
     atomic_queue::RetryDecorator<atomic_queue::AtomicQueueB2<float>> q(10);
-    BOOST_CHECK_EQUAL(q.capacity(), CACHE_LINE_SIZE * CACHE_LINE_SIZE);
+    BOOST_CHECK_EQUAL(q.capacity(), CAPACITY);
     BOOST_CHECK(q.was_empty());
     BOOST_CHECK(!q.was_full());
 }