diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-07 17:20:02 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-11 11:10:55 +0200 |
| commit | 25f2d8826e7c99d3e022e5774ff4530c2af5b0ba (patch) | |
| tree | ff822df754380dde5d1843225985fb80b76b8d31 /ci/ciimage/arch | |
| parent | 1ab0694556b6c0117b7b5072ec906dee2029adec (diff) | |
| download | meson-25f2d8826e7c99d3e022e5774ff4530c2af5b0ba.tar.gz | |
ci: Fix CI image builder
Diffstat (limited to 'ci/ciimage/arch')
| -rwxr-xr-x | ci/ciimage/arch/install.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh index 0a33f1ded..72816ab95 100755 --- a/ci/ciimage/arch/install.sh +++ b/ci/ciimage/arch/install.sh @@ -2,10 +2,12 @@ set -e +source /ci/common.sh + # Inspired by https://github.com/greyltc/docker-archlinux-aur/blob/master/add-aur.sh pkgs=( - python python-setuptools python-wheel python-pip python-pytest-xdist python-gobject python-jsonschema + python python-pip ninja make git sudo fakeroot autoconf automake patch libelf gcc gcc-fortran gcc-objc vala rust bison flex cython go dlang-dmd mono boost qt5-base gtkmm3 gtest gmock protobuf wxgtk2 gobject-introspection @@ -17,7 +19,6 @@ pkgs=( ) aur_pkgs=(scalapack) -pip_pkgs=(gcovr) cleanup_pkgs=(go) AUR_USER=docker @@ -30,7 +31,7 @@ sed -i "s,PKGEXT='.pkg.tar.zst',PKGEXT='.pkg.tar',g" /etc/makepkg.conf # Install packages pacman -Syu $PACMAN_OPTS "${pkgs[@]}" -python -m pip install "${pip_pkgs[@]}" +install_python_packages # Setup the user useradd -m $AUR_USER |