build: Update GitLab CI requirements
- Update Ubuntu dependencies - Disable Fedora build until webkit2gtk-4.1 available
This commit is contained in:
parent
796845aaa7
commit
10f4b80ef0
1 changed files with 27 additions and 27 deletions
|
|
@ -22,15 +22,15 @@ variables:
|
||||||
INSTALL_CMD: ninja -v -C $BUILD_DIR install
|
INSTALL_CMD: ninja -v -C $BUILD_DIR install
|
||||||
|
|
||||||
# Fedora packages
|
# Fedora packages
|
||||||
FEDORA_DEPS:
|
#FEDORA_DEPS:
|
||||||
meson vala desktop-file-utils enchant2-devel folks-devel gcr-devel
|
# meson vala desktop-file-utils enchant2-devel folks-devel gcr-devel
|
||||||
glib2-devel gmime30-devel gnome-online-accounts-devel gspell-devel
|
# glib2-devel gmime30-devel gnome-online-accounts-devel gspell-devel
|
||||||
gsound-devel gtk3-devel iso-codes-devel json-glib-devel itstool
|
# gsound-devel gtk3-devel iso-codes-devel json-glib-devel itstool
|
||||||
libappstream-glib-devel libgee-devel libhandy1-devel libicu-devel
|
# libappstream-glib-devel libgee-devel libhandy1-devel libicu-devel
|
||||||
libpeas-devel libsecret-devel libstemmer-devel libunwind-devel
|
# libpeas-devel libsecret-devel libstemmer-devel libunwind-devel
|
||||||
libxml2-devel libytnef-devel sqlite-devel webkitgtk4-devel
|
# libxml2-devel libytnef-devel sqlite-devel webkit2gtk3-devel
|
||||||
git
|
# git
|
||||||
FEDORA_TEST_DEPS: glibc-langpack-en gnutls-utils tar Xvfb xz
|
#FEDORA_TEST_DEPS: glibc-langpack-en gnutls-utils tar Xvfb xz
|
||||||
|
|
||||||
# Ubuntu packages
|
# Ubuntu packages
|
||||||
UBUNTU_DEPS:
|
UBUNTU_DEPS:
|
||||||
|
|
@ -40,27 +40,27 @@ variables:
|
||||||
libgoa-1.0-dev libgspell-1-dev libgsound-dev libgtk-3-dev
|
libgoa-1.0-dev libgspell-1-dev libgsound-dev libgtk-3-dev
|
||||||
libhandy-1-dev libicu-dev libjson-glib-dev libmessaging-menu-dev
|
libhandy-1-dev libicu-dev libjson-glib-dev libmessaging-menu-dev
|
||||||
libpeas-dev libsecret-1-dev libsqlite3-dev libstemmer-dev
|
libpeas-dev libsecret-1-dev libsqlite3-dev libstemmer-dev
|
||||||
libunwind-dev libwebkit2gtk-4.0-dev libxml2-dev libytnef0-dev
|
libunwind-dev libwebkit2gtk-4.1-dev libxml2-dev libytnef0-dev
|
||||||
git ca-certificates
|
git ca-certificates
|
||||||
UBUNTU_TEST_DEPS: gnutls-bin librsvg2-common locales xauth xvfb
|
UBUNTU_TEST_DEPS: gnutls-bin librsvg2-common locales xauth xvfb
|
||||||
|
|
||||||
fedora:
|
#fedora:
|
||||||
stage: build
|
# stage: build
|
||||||
image: fedora:rawhide
|
# image: fedora:rawhide
|
||||||
before_script:
|
# before_script:
|
||||||
- dnf update -y --nogpgcheck
|
# - dnf update -y --nogpgcheck
|
||||||
- dnf install -y --nogpgcheck $FEDORA_DEPS $FEDORA_TEST_DEPS
|
# - dnf install -y --nogpgcheck $FEDORA_DEPS $FEDORA_TEST_DEPS
|
||||||
script:
|
# script:
|
||||||
- $CONFIG_CMD
|
# - $CONFIG_CMD
|
||||||
- $BUILD_CMD
|
# - $BUILD_CMD
|
||||||
- $TEST_CMD
|
# - $TEST_CMD
|
||||||
- $INSTALL_CMD
|
# - $INSTALL_CMD
|
||||||
artifacts:
|
# artifacts:
|
||||||
when: 'always'
|
# when: 'always'
|
||||||
paths:
|
# paths:
|
||||||
- '$BUILD_DIR/meson-logs/meson-log.txt'
|
# - '$BUILD_DIR/meson-logs/meson-log.txt'
|
||||||
- '$BUILD_DIR/meson-logs/testlog.txt'
|
# - '$BUILD_DIR/meson-logs/testlog.txt'
|
||||||
expire_in: 2 days
|
# expire_in: 2 days
|
||||||
|
|
||||||
ubuntu:
|
ubuntu:
|
||||||
stage: build
|
stage: build
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue