From 639eb8301bff03e5618b998f25a73b5bcb7e08a3 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Thu, 19 Jun 2025 15:48:35 +1000 Subject: [PATCH] Use apt directly --- .gitea/workflows/linux-cmake.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/linux-cmake.yaml b/.gitea/workflows/linux-cmake.yaml index 38059e6..83013e2 100644 --- a/.gitea/workflows/linux-cmake.yaml +++ b/.gitea/workflows/linux-cmake.yaml @@ -8,10 +8,14 @@ jobs: strategy: matrix: flavour: [ - "-DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=N", - "-DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=N", - "-DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=Y", - "-DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=Y", + "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=N", + "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=N", + "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=Y", + "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=Y", + "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=N", + "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=N", + "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=Y", + "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=Y", ] exclude: - os: macos-latest @@ -21,7 +25,7 @@ jobs: - name: Install Dependencies run: | apt update - apt install -y cmake ninja libxmu-dev libxi-dev libgl-dev libegl1-mesa-dev dos2unix + apt install -y cmake ninja-build libxmu-dev libxi-dev libgl-dev libegl1-mesa-dev dos2unix - name: Git Checkout uses: actions/checkout@v4 - name: Generate Code @@ -32,7 +36,7 @@ jobs: - name: Build Binaries run: | mkdir build_ - cmake build/cmake -B build_ --fresh ${{ matrix.flavour }} + cmake build/cmake -B build_ -G Ninja --fresh ${{ matrix.flavour }} rm -Rf build_