package/ci: minor cleanup.

package/ci/android-x86-vulkan.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -ev
 
+# Get the toolchains submodule for UseAndroid.cmake that's used by tests
 git submodule update --init
 
 # Corrade
@@ -99,8 +100,15 @@ cmake .. \
     -DMAGNUM_BUILD_GL_TESTS=OFF \
     -DMAGNUM_BUILD_VK_TESTS=ON \
     -G Ninja
+
 ninja $NINJA_JOBS
 
+# The GL library shouldn't get built by accident
+if ls Debug/lib/libMagnumGL*; then
+    echo "The MagnumGL library was built even though it shouldn't"
+    false
+fi
+
 # Wait for emulator to start (done in parallel to build) and run tests
 circle-android wait-for-boot
 # `adb push` uploads timeout quite often, and then CircleCI waits 10 minutes

package/ci/circleci.yml

@@ -707,7 +707,6 @@ jobs:
     executor: xcode-14_0
     environment:
       CMAKE_CXX_FLAGS: --coverage
-      CONFIGURATION: Debug
     steps:
     - install-base-macos:
         extra: sdl2 glfw wget

package/ci/unix-desktop-vulkan.sh

@@ -10,9 +10,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=Debug \
-    -DCORRADE_BUILD_DEPRECATED=$BUILD_DEPRECATED \
     -DCORRADE_WITH_INTERCONNECT=OFF \
-    -DCORRADE_WITH_PLUGINMANAGER=ON \
     -G Ninja
 ninja install
 cd ../..
@@ -73,7 +71,6 @@ cmake .. \
     -DMAGNUM_BUILD_TESTS=ON \
     -DMAGNUM_BUILD_GL_TESTS=OFF \
     -DMAGNUM_BUILD_VK_TESTS=ON \
-    -DMAGNUM_BUILD_DEPRECATED=$BUILD_DEPRECATED \
     -G Ninja
 
 ninja $NINJA_JOBS
@@ -87,7 +84,7 @@ fi
 export VK_ICD_FILENAMES=$HOME/swiftshader/share/vulkan/icd.d/vk_swiftshader_icd.json
 export CORRADE_TEST_COLOR=ON
 
-# Keep in sync with PKGBUILD, PKGBUILD-coverage and PKGBUILD-release
+# Keep in sync with PKGBUILD and PKGBUILD-coverage
 ctest -V
 MAGNUM_VULKAN_VERSION=1.0 CORRADE_TEST_SKIP_BENCHMARKS=ON ctest -V -R VkTest
 MAGNUM_DISABLE_EXTENSIONS="VK_KHR_get_physical_device_properties2 VK_KHR_get_memory_requirements2 VK_KHR_bind_memory2 VK_KHR_create_renderpass2 VK_KHR_copy_commands2 VK_KHR_maintenance1 VK_KHR_multiview VK_KHR_maintenance2" MAGNUM_VULKAN_VERSION=1.0 CORRADE_TEST_SKIP_BENCHMARKS=ON ctest -V -R VkTest