diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f7cf841..51938010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,15 +22,15 @@ variables: INSTALL_CMD: ninja -v -C $BUILD_DIR install # Fedora packages - #FEDORA_DEPS: - # meson vala desktop-file-utils enchant2-devel folks-devel gcr-devel - # glib2-devel gmime30-devel gnome-online-accounts-devel gspell-devel - # gsound-devel gtk3-devel iso-codes-devel json-glib-devel itstool - # libappstream-glib-devel libgee-devel libhandy1-devel libicu-devel - # libpeas-devel libsecret-devel libstemmer-devel libunwind-devel - # libxml2-devel libytnef-devel sqlite-devel webkit2gtk3-devel - # git - #FEDORA_TEST_DEPS: glibc-langpack-en gnutls-utils tar Xvfb xz + FEDORA_DEPS: + meson vala cmake desktop-file-utils enchant2-devel folks-devel gcr3-devel + glib2-devel gmime30-devel gnome-online-accounts-devel gspell-devel + gsound-devel gtk3-devel iso-codes-devel json-glib-devel itstool + libappstream-glib-devel libgee-devel libhandy1-devel libicu-devel + libpeas-devel libsecret-devel libstemmer-devel libunwind-devel + libxml2-devel libytnef-devel sqlite-devel webkitgtk4-devel + git + FEDORA_TEST_DEPS: glibc-langpack-en gnutls-utils tar Xvfb xz # Ubuntu packages UBUNTU_DEPS: @@ -44,23 +44,23 @@ variables: git ca-certificates UBUNTU_TEST_DEPS: gnutls-bin librsvg2-common locales xauth xvfb -#fedora: -# stage: build -# image: fedora:rawhide -# before_script: -# - dnf update -y --nogpgcheck -# - dnf install -y --nogpgcheck $FEDORA_DEPS $FEDORA_TEST_DEPS -# script: -# - $CONFIG_CMD -# - $BUILD_CMD -# - $TEST_CMD -# - $INSTALL_CMD -# artifacts: -# when: 'always' -# paths: -# - '$BUILD_DIR/meson-logs/meson-log.txt' -# - '$BUILD_DIR/meson-logs/testlog.txt' -# expire_in: 2 days +fedora: + stage: build + image: fedora:rawhide + before_script: + - dnf update -y --nogpgcheck + - dnf install -y --nogpgcheck $FEDORA_DEPS $FEDORA_TEST_DEPS + script: + - $CONFIG_CMD + - $BUILD_CMD + - $TEST_CMD + - $INSTALL_CMD + artifacts: + when: 'always' + paths: + - '$BUILD_DIR/meson-logs/meson-log.txt' + - '$BUILD_DIR/meson-logs/testlog.txt' + expire_in: 2 days ubuntu: stage: build