Remove setup-ninja action

KhiopsML · Jan 24, 2024 · 8d4f1ac · 8d4f1ac
1 parent 2e12ffb
commit 8d4f1ac
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/.github/actions/build-khiops/action.yml b/.github/actions/build-khiops/action.yml
@@ -1,6 +1,6 @@
 ---
 name: Build Khiops
-description: Action to execute CMake configure/build presets
+description: Executes CMake configure/build presets
 inputs:
   preset-name:
     description: The CMake preset name
@@ -9,16 +9,14 @@ inputs:
     description: "List of overriding flags for the preset defaults (ex: '-DUSE_MPI=OFF\
       \ -DBUILD_JARS=ON')"
   targets:
-    description: "List of targets to be built (ex: 'MODL norm_test')"
+    description: "List of targets (ex: 'MODL norm_test')"
 runs:
   using: composite
   steps:
     - name: Setup MPI
       uses: mpi4py/setup-mpi@v1
-    - name: Setup Ninja
-      uses: ashutoshvarma/[email protected]
     - name: Load Visual C++ Environment Variables (Windows only)
-      if: ${{ runner.os == 'Windows' }}
+      if: runner.os == 'Windows'
       shell: cmd
       run: |
         call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"

diff --git a/.github/workflows/pack-macos.yml b/.github/workflows/pack-macos.yml
@@ -9,7 +9,9 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Check out sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Install Ninja
+        run: brew install ninja
       - name: Build Khiops executables
         uses: ./.github/actions/build-khiops
         with:
@@ -18,7 +20,7 @@ jobs:
       - name: Build package with CPack
         run: cd build/${{env.PRESET_NAME}} && cpack -G ZIP
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: macos
           path: build/${{env.PRESET_NAME}}/packages/*.zip

diff --git a/.github/workflows/run-standard-tests.yml b/.github/workflows/run-standard-tests.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       matrix:
         build-setup:
-          - {os: windows-2022, cmake-preset: windows-msvc}
+          - {os: windows-latest, cmake-preset: windows-msvc}
           - {os: ubuntu-latest, cmake-preset: linux-gcc}
           - {os: macos-latest, cmake-preset: macos-clang}
         config: [debug, release]
@@ -65,6 +65,12 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
+      - name: Install Ninja (Linux)
+        if: matrix.build-setup.os == 'ubuntu-latest'
+        run: sudo apt-get install ninja-build
+      - name: Install Ninja (macOS)
+        if: matrix.build-setup.os == 'macos-latest'
+        run: brew install ninja
       - name: Build all binaries
         uses: ./.github/actions/build-khiops
         with:

diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
@@ -14,6 +14,7 @@ on:
       - src/**.yac
       - test/**.h
       - test/**.cpp
+      - .github/workflows/run-unit-tests.yml
 jobs:
   run-unit-tests:
     defaults:
@@ -33,7 +34,13 @@ jobs:
       checks: write
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Install Ninja (Linux)
+        if: matrix.build-setup.os == 'ubuntu-latest'
+        run: sudo apt-get install ninja-build
+      - name: Install Ninja (macOS)
+        if: matrix.build-setup.os == 'macos-latest'
+        run: brew install ninja
       - name: Build Khiops test executables
         uses: ./.github/actions/build-khiops
         with: