ci : simplify, switch to ninja (#1295)

* CI: Move GGML_N_THREADS to env

* CI: Move macos-13 into matrix

* CI: Build with ninja

* CI: Remove env

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4114f593956d333bd2e7b6a2f7aa33cadb97a84..63aaebc88c761db6909654068cee1fb6756fdbab 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,42 +7,13 @@ on:
     branches: [ master ]
 
 jobs:
-  test-macos:
-    runs-on: macos-13
-    env:
-      GGML_NLOOP: 3
-      GGML_NITER: 1
-      GGML_N_THREADS: 2
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Build Environment
-      run: mkdir build
-
-    - name: Configure CMake
-      working-directory: ./build
-      run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGGML_METAL=OFF ..
-
-    - name: Build
-      working-directory: ./build
-      run: make
-
-    - name: Test
-      working-directory: ./build
-      run: ctest --verbose --timeout 900
-
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, macos-13]
 
     runs-on: ${{ matrix.os }}
 
-    env:
-      GGML_NLOOP: 3
-      GGML_NITER: 1
-
     steps:
     - uses: actions/checkout@v3
 
@@ -52,20 +23,13 @@ jobs:
         sudo apt-get update
         sudo apt-get install llvm
 
-    - name: Set GGML_N_THREADS for Ubuntu
-      run: echo "GGML_N_THREADS=2" >> $GITHUB_ENV
-      if: matrix.os == 'ubuntu-latest'
-
-    - name: Set GGML_N_THREADS for MacOS
-      run: echo "GGML_N_THREADS=2" >> $GITHUB_ENV
-      if: matrix.os == 'macos-latest'
-
     - name: Create Build Environment
       run: mkdir build
 
     - name: Configure CMake
       working-directory: ./build
       run: cmake ..
+        -G Ninja
         -DCMAKE_C_COMPILER=clang
         -DCMAKE_CXX_COMPILER=clang++
         -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installed
@@ -73,7 +37,7 @@ jobs:
 
     - name: Build
       working-directory: ./build
-      run: make
+      run: cmake --build .
 
     - name: Test
       working-directory: ./build