diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-11-12 09:34:33 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-11-12 09:38:28 +1000 |
| commit | 833b8d2da41f3a7eff440c56db72df6d121d72cd (patch) | |
| tree | ae812708b8545db24047d159d2b0b27932b64553 /.gitlab-ci | |
| parent | eef14179a293a8a78b37869e3918a35675005272 (diff) | |
| download | libinput-833b8d2da41f3a7eff440c56db72df6d121d72cd.tar.gz | |
gitlab CI: remove unused custom ubuntu install script
Looks like this has been obsolete since
4df2ac731ff3ae420081b3e243fc2cec636bdfd6 where it stopped passing in the
packages.
And a bug caused the template to checked the "version" against "ubuntu", so
the script hasn't actually been included in any job anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/ci.template | 5 | ||||
| -rw-r--r-- | .gitlab-ci/ubuntu_install.sh | 13 |
2 files changed, 0 insertions, 18 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 3a5f30db..bf316489 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -87,8 +87,6 @@ variables: {% endif %} {% endfor %} - UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS" - FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG FDO_UPSTREAM_REPO: libinput/libinput @@ -215,9 +213,6 @@ check-merge-request: FDO_DISTRIBUTION_VERSION: '{{version}}' FDO_DISTRIBUTION_PACKAGES: ${{distro.name.upper()}}_PACKAGES FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG - {% if version == 'ubuntu'%} - FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC - {% endif %} {% endfor %} {% endfor %} diff --git a/.gitlab-ci/ubuntu_install.sh b/.gitlab-ci/ubuntu_install.sh deleted file mode 100644 index 75683ee7..00000000 --- a/.gitlab-ci/ubuntu_install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -e -set -x - -export DEBIAN_FRONTEND=noninteractive - -apt-get install -y software-properties-common -add-apt-repository universe -apt-get update -apt-get -y upgrade - -apt-get install -y $@ |