aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci/debian-install.sh
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2019-07-25 14:45:08 +0100
committerEmil Velikov <[email protected]>2019-08-01 16:16:15 +0000
commit85dace1c0b7c1839d12171c2c9d63f8e4a002f35 (patch)
tree1487defb7068d8e4d7ab0fba97e811a81706a965 /.gitlab-ci/debian-install.sh
parent3307c85a7dd25fa24d712c69e9c169490a32398c (diff)
gitlab-ci: remove software-properties-common
Currently we use the python package to manage repositories. At the same time we also do that by hand - since it's a trivial echo to a file. Stay consistent, remove the package and manage things manually. Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Michel Dänzer <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to '.gitlab-ci/debian-install.sh')
-rw-r--r--.gitlab-ci/debian-install.sh11
1 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 578074ddb87..719d7830018 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -16,12 +16,11 @@ apt-get install -y \
curl \
wget \
unzip \
- gnupg \
- software-properties-common
+ gnupg
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main"
-add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main"
+echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main" >/etc/apt/sources.list.d/llvm7.list
+echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main" >/etc/apt/sources.list.d/llvm8.list
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
@@ -46,8 +45,8 @@ apt-get install -y -t stretch-backports \
clang-8
# Install remaining packages from Debian buster to get newer versions
-add-apt-repository "deb https://deb.debian.org/debian/ buster main"
-add-apt-repository "deb https://deb.debian.org/debian/ buster-updates main"
+echo "deb https://deb.debian.org/debian/ buster main" >/etc/apt/sources.list.d/buster.list
+echo "deb https://deb.debian.org/debian/ buster-updates main" >/etc/apt/sources.list.d/buster-updates.list
apt-get update
apt-get install -y \
bzip2 \