diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-05-08 11:30:09 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-05-14 12:54:09 +0000 |
| commit | fd9b445145851dcc3d697f3df46f86f86db466c0 (patch) | |
| tree | 75f72726860b6c41fcb2a7d0ce3470e418758382 | |
| parent | f2773d706707b14f3285f337cfeb5e37b8a60385 (diff) | |
gitlab-ci: Add Debian testing repository for x86_build image
We don't want LLVM 8 packages to be pulled in from testing though (it
would make installing llvm-8-dev for cross architectures a lot more
complicated), so explicitly select buster-backports for them (they were
already implicitly installed from there before, since they're not
available in buster proper).
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4851>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 22 |
2 files changed, 19 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bc3d9514e9..b2196cee5e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,7 +133,7 @@ x86_build: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-04-22-winehq" + FDO_DISTRIBUTION_TAG: &x86_build "2020-05-08" .use-x86_build: variables: diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 13c95d37ac9..5980d1550d8 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -35,8 +35,17 @@ echo 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Deb sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list +echo 'deb https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/testing.list apt-get update + +# Don't use newer packages from testing by default +cat >/etc/apt/preferences <<EOF +Package: * +Pin: release a=testing +Pin-Priority: 100 +EOF + apt-get dist-upgrade -y apt-get install -y --no-remove \ @@ -54,7 +63,6 @@ apt-get install -y --no-remove \ git \ libclang-6.0-dev \ libclang-7-dev \ - libclang-8-dev \ libclang-9-dev \ libclc-dev \ libelf-dev \ @@ -97,6 +105,9 @@ apt-get install -y --no-remove \ xz-utils \ zlib1g-dev +apt-get install -y --no-remove -t buster-backports \ + libclang-8-dev + # Cross-build Mesa deps for arch in $CROSS_ARCHITECTURES; do apt-get install -y --no-remove \ @@ -105,10 +116,12 @@ for arch in $CROSS_ARCHITECTURES; do libelf-dev:${arch} \ libexpat1-dev:${arch} \ libffi-dev:${arch} \ - libllvm8:${arch} \ libstdc++6:${arch} \ libtinfo-dev:${arch} + apt-get install -y --no-remove -t buster-backports \ + libllvm8:${arch} + if [ "$arch" == "i386" ]; then # libpciaccess-dev is only needed for Intel. apt-get install -y --no-remove \ @@ -118,11 +131,12 @@ for arch in $CROSS_ARCHITECTURES; do mkdir /var/cache/apt/archives/${arch} # Download llvm-* packages, but don't install them yet, since they can # only be installed for one architecture at a time - apt-get install -o Dir::Cache::archives=/var/cache/apt/archives/$arch --download-only -y --no-remove \ + apt-get install -o Dir::Cache::archives=/var/cache/apt/archives/$arch --download-only \ + -y --no-remove -t buster-backports \ llvm-8-dev:${arch} done -apt-get install -y --no-remove \ +apt-get install -y --no-remove -t buster-backports \ llvm-8-dev \ # for 64bit windows cross-builds |