diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-08-03 12:31:19 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-08-07 10:18:25 +0100 |
| commit | 32ce01095114ae087a77f437513d2f0806973cbf (patch) | |
| tree | 7434628b9310e6ceaaadc1edf9c2473deff272ec | |
| parent | 5b10ddf3589bdd6ef9cfc63a807ae91dc0e4095f (diff) | |
gitlab-ci: don't install autotools deps
These could've been deleted a long time ago, but apparent we forgot.
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4826f579711..10e6c4e99b9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ # repository's registry will be used there as well. variables: UPSTREAM_REPO: mesa/mesa - DEBIAN_TAG: "2019-08-03" + DEBIAN_TAG: "2019-08-07" DEBIAN_VERSION: stretch-slim DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 2acdaf438ee0..8770e100ee06 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -72,17 +72,11 @@ apt-get install -y \ libgtk-3-dev \ python-mako \ python3-mako \ - meson \ - scons - -# autotools build deps -apt-get install -y \ - automake \ - libtool \ bison \ flex \ gettext \ - make + meson \ + scons # Cross-build Mesa deps for arch in $CROSS_ARCHITECTURES; do @@ -215,9 +209,7 @@ apt-get install -y libxml2-utils # Remove unused packages apt-get purge -y \ - automake \ git \ - libtool \ curl \ unzip \ gnupg |