.drone.yml

@@ -21,7 +21,6 @@ steps:
       git submodule update --init --recursive
       conan build . \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
         -s build_type=Release \
         -o enable_static_analysis=False \
         -o enable_tests=True \
@@ -55,7 +54,6 @@ steps:
       git submodule update --init --recursive
       conan build . \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
         -s build_type=Release \
         -o enable_static_analysis=False \
         -o enable_tests=True \
@@ -86,8 +84,7 @@ steps:
 
       conan build . \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
+        -s build_type=Release \
-        -s build_type=Debug \
         -o enable_static_analysis=True \
         -o enable_tests=True \
         --build=missing

tools/ci/images/static_analysis/Dockerfile

@@ -13,9 +13,8 @@ RUN apk add --no-cache \
     mesa-dev \
     mesa-gl \
     pkgconf \
-    clang-extra-tools \
+    clang-extra-tools 
-    mold \
+
-    ninja-build
 
 RUN pip install --no-cache-dir --break-system-packages conan gitpython \
     && conan profile detect
@@ -24,18 +23,13 @@ RUN clang --version  \
     && conan --version \
     && pip --version \
     && cmake --version \
-    && g++ --version \
     && clang --version \
-    && clang-tidy --version \
+    && clang-tidy --version
-    && ninja --version \
-    && mold --version
 
 
 RUN git clone 'https://git.light7734.com/light7734/light.git' --recursive \
     && cd light \
     && conan install . \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
-        -s build_type=Debug \
         -o enable_static_analysis=True \
         --build=missing

tools/ci/images/unit_tests/Dockerfile

@@ -13,7 +13,6 @@ RUN apk add --no-cache \
     mesa-dev \
     mesa-gl \
     pkgconf \
-    ninja-build \
     mold
 
 
@@ -25,19 +24,15 @@ RUN clang --version  \
     && pip --version \
     && cmake --version \
     && g++ --version \
-    && clang --version \
+    && clang --version
-    && ninja --version \
-    && mold --version
 
 RUN git clone 'https://git.light7734.com/light7734/light.git' --recursive \
     && cd light \
     && conan install . \
         -s build_type=Debug \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
         --build=missing \
     && conan install . \
         -s build_type=Release \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
         --build=missing

tools/ci/images/valgrind/Dockerfile

@@ -13,7 +13,6 @@ RUN apk add --no-cache \
     mesa-dev \
     mesa-gl \
     pkgconf \
-    ninja-build \
     mold \
     valgrind
 
@@ -25,19 +24,15 @@ RUN clang --version  \
     && pip --version \
     && cmake --version \
     && g++ --version \
-    && clang --version \
+    && clang --version
-    && ninja --version \
-    && mold --version
 
 RUN git clone 'https://git.light7734.com/light7734/light.git' --recursive \
     && cd light \
     && conan install . \
         -s build_type=Debug \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
         --build=missing \
     && conan install . \
         -s build_type=Release \
         -c tools.system.package_manager:mode=install \
-        -c tools.cmake.cmaketoolchain:generator=Ninja \
         --build=missing