Merge branch 'apt-get' into 'master'

CI: Use apt-get rather than apt

See merge request federicomenaquintero/bzip2!33
This commit is contained in:
Jordan Petridis 2019-07-22 09:26:51 +00:00
commit 3eff339237

View File

@ -44,31 +44,31 @@ debian:testing:
extends: '.meson_test'
image: $AMD64_DEBIAN_TESTING
before_script:
- apt update -y
- apt install -y gcc meson python3-distutils
- apt-get update -y
- apt-get install -y gcc meson python3-distutils
ubuntu:bionic:cmake:
extends: '.cmake_test'
image: $AMD64_UBUNTU_BIONIC
before_script:
- apt update -y
- apt install -y gcc make python3-pip
- apt-get update -y
- apt-get install -y gcc make python3-pip
- pip3 install cmake
ubuntu:bionic:meson:
extends: '.meson_test'
image: $AMD64_UBUNTU_BIONIC
before_script:
- apt update -y
- apt install -y gcc python3-pip ninja-build
- apt-get update -y
- apt-get install -y gcc python3-pip ninja-build
- pip3 install meson
ubuntu:bionic:i386:
extends: '.meson_test'
image: $I386_UBUNTU_BIONIC
before_script:
- apt update -y
- apt install -y gcc python3-pip ninja-build
- apt-get update -y
- apt-get install -y gcc python3-pip ninja-build
- pip3 install meson
fedora:30: