diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2019-02-13 09:28:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2019-02-13 14:46:04 +1000 |
| commit | c3cc370a6c244c49a5008153b3f2522bd87a38b6 (patch) | |
| tree | 4e021b3b413c7a6f7ca84c255337045ec9a68084 /.gitlab-ci.yml | |
| parent | 8b761e2fec12a500b8c4e5c91274a8e9f53056ae (diff) | |
| download | libinput-c3cc370a6c244c49a5008153b3f2522bd87a38b6.tar.gz | |
gitlab CI: update arch linux source imagewip/update-arch-image
The old one is deprecated (and removed), new one is archlinux/base which also
now requires the diffutils package.
The new one apparently doesn't come with /var/cache/pacman/pkg and it's
not created, so pacman clean exits with an error, breaking the build.
Simply create that directory and everything is hunky, though dory remains
elusive.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dc037e8..306c1f67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ variables: ############################################################################### FEDORA_RPMS: 'git gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark valgrind libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel' UBUNTU_DEBS: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme valgrind libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' - ARCH_PKGS: 'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark valgrind libwacom gtk3 mtdev ' + ARCH_PKGS: 'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark valgrind libwacom gtk3 mtdev diffutils' FREEBSD_BUILD_PKGS: 'meson' FREEBSD_PKGS: 'libepoll-shim libudev-devd libevdev libwacom gtk3 libmtdev ' ############################ end of package lists ############################# @@ -293,10 +293,12 @@ ubuntu:18.04@container-prep: .arch@container-prep: extends: .container-prep script: - - buildcntr=$(buildah from --quiet base/archlinux) + - buildcntr=$(buildah from --quiet archlinux/base) - buildah run $buildcntr pacman -S --refresh - buildah run $buildcntr pacman -S --sysupgrade --noconfirm - buildah run $buildcntr pacman -S --noconfirm $ARCH_PKGS + # in case it doesn't exist yet, otherwise pacman clean fails + - buildah run $buildcntr mkdir -p /var/cache/pacman/pkg - buildah run $buildcntr pacman -S --clean --noconfirm - buildah config --workingdir /app $buildcntr # tag the current container |