diff --git a/.gitlab-ci/.fedora.Dockerfile.swp b/.gitlab-ci/.fedora.Dockerfile.swp deleted file mode 100644 index 8dfbbcce60..0000000000 Binary files a/.gitlab-ci/.fedora.Dockerfile.swp and /dev/null differ diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 00f2c877f2..d7ba93faaa 100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -34,7 +34,8 @@ pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-shared-mime-info \ mingw-w64-$MSYS2_ARCH-python-gobject \ mingw-w64-$MSYS2_ARCH-shaderc \ - mingw-w64-$MSYS2_ARCH-vulkan + mingw-w64-$MSYS2_ARCH-vulkan \ + mingw-w64-$MSYS2_ARCH-vulkan-headers mkdir -p _ccache export CCACHE_BASEDIR="$(pwd)" @@ -44,7 +45,7 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" ccache --zero-stats ccache --show-stats export CCACHE_DISABLE=true -meson \ +meson setup \ -Dx11-backend=false \ -Dwayland-backend=false \ -Dwin32-backend=true \