Commit 981bef46 authored by Salamandar's avatar Salamandar
Browse files

Fix gitlab-ci

parent da4a1b6d
Pipeline #145726 passed with stages
in 12 minutes and 33 seconds
......@@ -6,33 +6,36 @@ stages:
# Use official CentOS image https://hub.docker.com/_/centos/.
image: centos:centos7
before_script:
- yum update -y
- yum install -y which gnome-common yelp-tools glib2-devel intltool
gcc-c++ libuuid-devel parted-devel gtkmm30-devel make
polkit file
- yum --quiet --assumeyes update
- yum --quiet --assumeyes install
which gnome-common yelp-tools glib2-devel intltool gcc-c++ libuuid-devel
parted-devel gtkmm30-devel make polkit file python3-pip
- pip3 install meson
# Extra packages only needed during the test stage.
# Install EPEL repo first for f2fs-tools and ntfsprogs.
- yum install -y epel-release
- yum install -y btrfs-progs e2fsprogs f2fs-tools dosfstools mtools
hfsplus-tools util-linux cryptsetup device-mapper lvm2
ntfsprogs udftools xfsprogs xfsdump
xorg-x11-server-Xvfb kmod
- yum install -y meson
- yum --quiet --assumeyes install
epel-release
- yum --quiet --assumeyes install
btrfs-progs e2fsprogs f2fs-tools dosfstools mtools hfsplus-tools
util-linux cryptsetup device-mapper lvm2 ninja-build ntfsprogs udftools
xfsprogs xfsdump xorg-x11-server-Xvfb kmod git
- ln -s ninja-build /usr/bin/ninja
- cat /etc/os-release
.ubuntu_image_template: &ubuntu_image_definition
# Use official Ubuntu image https://hub.docker.com/_/ubuntu/.
image: ubuntu:latest
before_script:
- apt-get update
- apt-get install -y gnome-common yelp-tools libglib2.0-dev-bin
uuid-dev libparted-dev libgtkmm-3.0-dev make
policykit-1 meson
- apt update
- apt install -y
gnome-common yelp-tools libglib2.0-dev-bin uuid-dev libparted-dev
libgtkmm-3.0-dev make policykit-1 python3-pip ninja-build
- pip3 install meson
# Extra packages only needed during the test stage.
- apt-get install -y btrfs-progs e2fsprogs f2fs-tools dosfstools mtools
hfsutils hfsprogs jfsutils util-linux cryptsetup-bin
dmsetup lvm2 nilfs-tools ntfs-3g reiser4progs
reiserfsprogs udftools xfsprogs xfsdump xvfb kmod
- apt install -y
btrfs-progs e2fsprogs f2fs-tools dosfstools mtools hfsutils hfsprogs
jfsutils util-linux cryptsetup-bin dmsetup lvm2 nilfs-tools ntfs-3g
reiser4progs reiserfsprogs udftools xfsprogs xfsdump xvfb kmod git
- cat /etc/os-release
.build_stage_template: &build_stage_definition
......@@ -58,7 +61,7 @@ stages:
# Exclude specific unit test which fails without /dev/disk in Docker images.
- export GTEST_FILTER='-BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches'
- ninja -C _build test
- ninja -C _build distcheck
- ninja -C _build dist
# Save all files on job failure for investigation.
artifacts:
when: on_failure
......@@ -79,9 +82,11 @@ ubuntu_build:
# Check GParted unit tests and distcheck pass on CentOS and Ubuntu.
centos_test:
needs: ["centos_build"]
<<: *centos_image_definition
<<: *test_stage_definition
ubuntu_test:
needs: ["ubuntu_build"]
<<: *ubuntu_image_definition
<<: *test_stage_definition
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment