colin/gnome-calls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Unbreak CI after Debian Bullseye release

Browse Source 
- Get rid of the dependencies from experimental
- Use PureOS Byzantium image for arm64 packaging job
  (as this will probably fix the spurious CI failures)
This commit is contained in:
Evangelos Ribeiro Tzaras
2021-08-25 09:36:56 +02:00
parent 44f0786bcc
commit 5ab908a294
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.gitlab-ci.yml
View File

@@ -8,7 +8,7 @@ stages:
- test-package - test-package
variables: variables:
L5_DOCKER_IMAGE: debian:bullseye L5_DOCKER_IMAGE: debian:bookworm
build:native: build:native:
stage: build stage: build
@@ -19,19 +19,15 @@ build:native:
COMMON_BUILD_OPTS: -Db_coverage=true --werror COMMON_BUILD_OPTS: -Db_coverage=true --werror
BUILD_OPTS: -Dgtk_doc=true ${COMMON_BUILD_OPTS} BUILD_OPTS: -Dgtk_doc=true ${COMMON_BUILD_OPTS}
WANT_BUILD_DEPS: "true" WANT_BUILD_DEPS: "true"
EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
except: except:
variables: variables:
- $PKG_ONLY == "1" - $PKG_ONLY == "1"
image: debian:bullseye image: debian:bookworm
tags: [] tags: []
before_script: before_script:
- export DEBIAN_FRONTEND=noninteractive - export DEBIAN_FRONTEND=noninteractive
- apt-get -y update - apt-get -y update
- apt-get -y install eatmydata - apt-get -y install eatmydata
- echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
- eatmydata apt-get -y update
- eatmydata apt-get -y install $EXP_DEPS
- eatmydata apt-get -y install lcov - eatmydata apt-get -y install lcov
- '[ "${WANT_BUILD_DEPS}" != "true" ] || eatmydata apt-get -y build-dep .' - '[ "${WANT_BUILD_DEPS}" != "true" ] || eatmydata apt-get -y build-dep .'
- ulimit -c unlimited - ulimit -c unlimited
@@ -81,7 +77,7 @@ check-po:
validate-metadata: validate-metadata:
stage: test stage: test
image: debian:bullseye image: debian:bookworm
tags: [] tags: []
before_script: before_script:
- export DEBIAN_FRONTEND=noninteractive - export DEBIAN_FRONTEND=noninteractive
@@ -90,26 +86,17 @@ validate-metadata:
script: script:
- appstream-util validate data/org.gnome.Calls.metainfo.xml - appstream-util validate data/org.gnome.Calls.metainfo.xml
package-debian-bullseye: package-debian-bookworm:
variables:
EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
tags: [] tags: []
extends: .l5-build-debian-package extends: .l5-build-debian-package
before_script:
- echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
- apt-get -y update
- apt-get -y install $EXP_DEPS
package-debian-bullseye:arm64: package-deb-pureos-byzantium:arm64:
variables: variables:
EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental L5_DOCKER_IMAGE: pureos/byzantium
DEB_BUILD_PROFILES: nodoc
tags: tags:
- aarch64 - aarch64
extends: .l5-build-debian-package extends: .l5-build-debian-package
before_script:
- echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
- apt-get -y update
- apt-get -y install $EXP_DEPS
# For some reason including https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml fails with a network error (status code 500), therefore it's copied here # For some reason including https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml fails with a network error (status code 500), therefore it's copied here
.flatpak: .flatpak: