s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixci' into 'master'

Browse Source 
ci: Use bookworm for online builds

See merge request World/Phosh/squeekboard!561
This commit is contained in:
dcz
2022-06-29 15:20:20 +00:00
parent 0aee348e30 a8fe4a492e
commit 50ef4ab433
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -23,12 +23,14 @@ build_docs:
- $PKG_ONLY == "1" - $PKG_ONLY == "1"
build_meson: build_meson:
image: debian:bookworm
stage: build stage: build
artifacts: artifacts:
paths: paths:
- _build - _build
expire_in: 3h expire_in: 3h
script: script:
- mv debian/control-newer debian/control
- apt-get -y build-dep . - apt-get -y build-dep .
- meson . _build/ -Ddepdatadir=/usr/share --werror - meson . _build/ -Ddepdatadir=/usr/share --werror
- ninja -C _build install - ninja -C _build install
@ -96,6 +98,7 @@ build_deb:future:
- cp ../*.deb . - cp ../*.deb .
build_reference: build_reference:
image: debian:bookworm
stage: build stage: build
needs: needs:
- job: build_meson - job: build_meson
@ -124,11 +127,13 @@ test_lintian:
- $PKG_ONLY == "1" - $PKG_ONLY == "1"
test: test:
image: debian:bookworm
stage: test stage: test
needs: needs:
- job: build_meson - job: build_meson
artifacts: true artifacts: true
script: script:
- mv debian/control-newer debian/control
- apt-get -y build-dep . - apt-get -y build-dep .
- apt-get -y install clang-tidy - apt-get -y install clang-tidy
- ninja -C _build test - ninja -C _build test

4
Cargo.deps.online
View File

@ -2,7 +2,3 @@
[patch.crates-io] [patch.crates-io]
# Dependency was yanked, but gio 0.7 needs it. # Dependency was yanked, but gio 0.7 needs it.
fragile = { git = "https://source.puri.sm/dorota.czaplejewicz/fragile.git", tag = "0.3.0" } 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.*"