diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0301def..f3767469 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,12 +23,14 @@ build_docs: - $PKG_ONLY == "1" build_meson: + image: debian:bookworm stage: build artifacts: paths: - _build expire_in: 3h script: + - mv debian/control-newer debian/control - apt-get -y build-dep . - meson . _build/ -Ddepdatadir=/usr/share --werror - ninja -C _build install @@ -96,6 +98,7 @@ build_deb:future: - cp ../*.deb . build_reference: + image: debian:bookworm stage: build needs: - job: build_meson @@ -124,11 +127,13 @@ test_lintian: - $PKG_ONLY == "1" test: + image: debian:bookworm stage: test needs: - job: build_meson artifacts: true script: + - mv debian/control-newer debian/control - apt-get -y build-dep . - apt-get -y install clang-tidy - ninja -C _build test diff --git a/Cargo.deps.online b/Cargo.deps.online index f1973045..54e8e17e 100644 --- a/Cargo.deps.online +++ b/Cargo.deps.online @@ -2,7 +2,3 @@ [patch.crates-io] # Dependency was yanked, but gio 0.7 needs it. fragile = { git = "https://source.puri.sm/dorota.czaplejewicz/fragile.git", tag = "0.3.0" } - -# Override automatic upgrade done in serde_yaml. -[dependencies.indexmap] -version = "1.8.*"