summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2020-06-03 21:22:21 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2020-06-03 21:22:56 +1000
commit75ca6dcfa3bd35219d75922dbf03945d31fcdb86 (patch)
treea2289db63ad26f6a578ce57891a5734a6cb26748
parent2a7ea444e301f175646ec707a9df122bac7a55c4 (diff)
gitlab CI: alpine needs pip explicitly installed now
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--.gitlab-ci/ci.template6
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86fc8596..e60cd995 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,7 +138,7 @@ check-ci-script:
image: golang:alpine
stage: prep
before_script:
- - apk add python3 git
+ - apk add python3 py-pip git
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
script:
- ci-fairy generate-template
@@ -154,7 +154,7 @@ check-commit:
image: golang:alpine
stage: prep
before_script:
- - apk add python3 git
+ - apk add python3 py-pip git
script:
- pip3 install GitPython
- pip3 install pytest
@@ -340,7 +340,7 @@ freebsd:11.2@container-prep:
- .policy
image: golang:alpine
before_script:
- - apk add python3 git
+ - apk add python3 py-pip git
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
script:
# Go to your Profile, Settings, Access Tokens
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index f103d523..20f790ad 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -134,7 +134,7 @@ check-ci-script:
image: golang:alpine
stage: prep
before_script:
- - apk add python3 git
+ - apk add python3 py-pip git
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
script:
- ci-fairy generate-template
@@ -150,7 +150,7 @@ check-commit:
image: golang:alpine
stage: prep
before_script:
- - apk add python3 git
+ - apk add python3 py-pip git
script:
- pip3 install GitPython
- pip3 install pytest
@@ -287,7 +287,7 @@ freebsd:11.2@container-prep:
- .policy
image: golang:alpine
before_script:
- - apk add python3 git
+ - apk add python3 py-pip git
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
script:
# Go to your Profile, Settings, Access Tokens