ci: Switch build to bookworm / byzantium
Use Debian bookworm for the tests and PureOS byzantium for the package build We use the arm64 builder as the amd64 one fails to find a shell in the bookworm image.
This commit is contained in:
committed by
Guido Gunther
parent
50608ce5a2
commit
bbcb396df8
+20
-11
@@ -1,12 +1,11 @@
|
|||||||
include:
|
include:
|
||||||
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
|
- remote: 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
|
||||||
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-bullseye-jobs.yml'
|
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34039cd573a2df832d465bc9e4c5f543571f5241/templates/ci-fairy.yml'
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
- package
|
- package
|
||||||
- test-package
|
|
||||||
|
|
||||||
.before_script: &before_script
|
.before_script: &before_script
|
||||||
before_script:
|
before_script:
|
||||||
@@ -15,16 +14,20 @@ stages:
|
|||||||
- apt-get -y build-dep .
|
- apt-get -y build-dep .
|
||||||
- apt-get -y install gcovr
|
- apt-get -y install gcovr
|
||||||
|
|
||||||
|
.image: &image
|
||||||
|
image:
|
||||||
|
name: debian:bookworm
|
||||||
|
|
||||||
.tags: &tags
|
.tags: &tags
|
||||||
tags:
|
tags:
|
||||||
- librem5
|
- librem5:arm64
|
||||||
|
|
||||||
# Regular, full build
|
# Regular, full build
|
||||||
build:native-debian-bullseye:full:
|
build:native-debian-bookworm:full:
|
||||||
<<: *tags
|
<<: *tags
|
||||||
|
<<: *image
|
||||||
<<: *before_script
|
<<: *before_script
|
||||||
stage: build
|
stage: build
|
||||||
image: debian:bullseye
|
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- _build
|
- _build
|
||||||
@@ -36,11 +39,11 @@ build:native-debian-bullseye:full:
|
|||||||
- $PKG_ONLY == "1"
|
- $PKG_ONLY == "1"
|
||||||
|
|
||||||
# Minimal build for e.g. submodule usage
|
# Minimal build for e.g. submodule usage
|
||||||
build:native-debian-bullseye:lib:
|
build:native-debian-bookworm:lib:
|
||||||
<<: *tags
|
<<: *tags
|
||||||
|
<<: *image
|
||||||
<<: *before_script
|
<<: *before_script
|
||||||
stage: build
|
stage: build
|
||||||
image: debian:bullseye
|
|
||||||
script:
|
script:
|
||||||
- meson --werror -Ddaemon=false -Dgtk_doc=false . _build
|
- meson --werror -Ddaemon=false -Dgtk_doc=false . _build
|
||||||
- ninja -C _build
|
- ninja -C _build
|
||||||
@@ -48,13 +51,13 @@ build:native-debian-bullseye:lib:
|
|||||||
variables:
|
variables:
|
||||||
- $PKG_ONLY == "1"
|
- $PKG_ONLY == "1"
|
||||||
|
|
||||||
test:native-debian-bullseye:
|
test:native-debian-bookworm:
|
||||||
<<: *tags
|
<<: *tags
|
||||||
|
<<: *image
|
||||||
<<: *before_script
|
<<: *before_script
|
||||||
stage: test
|
stage: test
|
||||||
image: debian:bullseye
|
|
||||||
needs:
|
needs:
|
||||||
- build:native-debian-bullseye:full
|
- build:native-debian-bookworm:full
|
||||||
coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
|
coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
|
||||||
script:
|
script:
|
||||||
- dbus-run-session ninja -C _build test coverage
|
- dbus-run-session ninja -C _build test coverage
|
||||||
@@ -62,3 +65,9 @@ test:native-debian-bullseye:
|
|||||||
variables:
|
variables:
|
||||||
- $PKG_ONLY == "1"
|
- $PKG_ONLY == "1"
|
||||||
|
|
||||||
|
package:deb-pureos-byzantium:arm64:
|
||||||
|
variables:
|
||||||
|
L5_DOCKER_IMAGE: pureos/byzantium
|
||||||
|
extends: .l5-build-debian-package
|
||||||
|
tags:
|
||||||
|
- librem5:arm64
|
||||||
|
|||||||
Reference in New Issue
Block a user