Skip to content

Commit 66c46b8

Browse files
committed
CI: change how pytest is installed for latest debian
Latest debian refuses to let pip install systemo-wide packages and instead forces you to apt install them. And it fails to build a newer version of pip than provided by ubuntu:bionic.
1 parent 215b326 commit 66c46b8

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,40 +89,35 @@ debian:testing:meson:
8989
image: $AMD64_DEBIAN_TESTING
9090
before_script:
9191
- apt-get update -y
92-
- apt-get install -y gcc meson python3-distutils python3-pip valgrind
93-
- pip3 install pytest
92+
- apt-get install -y gcc meson python3-distutils python3-pytest valgrind
9493

9594
debian:testing:cmake:debug:
9695
extends: ".cmake_test_debug"
9796
image: $AMD64_DEBIAN_TESTING
9897
before_script:
9998
- apt-get update -y
100-
- apt-get install -y gcc make python3-pip cmake valgrind
101-
- pip3 install pytest
99+
- apt-get install -y gcc make python3-pytest cmake valgrind
102100

103101
debian:testing:cmake:
104102
extends: ".cmake_test"
105103
image: $AMD64_DEBIAN_TESTING
106104
before_script:
107105
- apt-get update -y
108-
- apt-get install -y gcc make python3-pip cmake valgrind
109-
- pip3 install pytest
106+
- apt-get install -y gcc make python3-pytest cmake valgrind
110107

111108
debian:testing:cmake:shared_static:
112109
extends: ".cmake_test_shared_static"
113110
image: $AMD64_DEBIAN_TESTING
114111
before_script:
115112
- apt-get update -y
116-
- apt-get install -y gcc make python3-pip cmake valgrind
117-
- pip3 install pytest
113+
- apt-get install -y gcc make python3-pytest cmake valgrind
118114

119115
debian:testing:cmake:static_only:
120116
extends: ".cmake_test_static_only"
121117
image: $AMD64_DEBIAN_TESTING
122118
before_script:
123119
- apt-get update -y
124-
- apt-get install -y gcc make python3-pip cmake valgrind
125-
- pip3 install pytest
120+
- apt-get install -y gcc make python3-pytest cmake valgrind
126121

127122
ubuntu:bionic:meson:
128123
extends: ".meson_test"
@@ -138,6 +133,7 @@ ubuntu:bionic:cmake:
138133
before_script:
139134
- apt-get update -y
140135
- apt-get install -y gcc make python3-pip valgrind
136+
- pip3 install --upgrade pip
141137
- pip3 install pytest cmake
142138

143139
ubuntu:bionic:i386:meson:
@@ -154,6 +150,7 @@ ubuntu:bionic:i386:cmake:
154150
before_script:
155151
- apt-get update -y
156152
- apt-get install -y gcc make python3-pip valgrind
153+
- pip3 install --upgrade pip
157154
- pip3 install pytest cmake
158155

159156
fedora:30:meson:

0 commit comments

Comments
 (0)