diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-10-08 15:56:53 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-10-08 16:20:51 +0200 |
| commit | ea76a3728bd50b2caa6a8134d32c38b13530d60f (patch) | |
| tree | b0ba309e3e8cead391f781059ccd91216615a8cf | |
| parent | 981c059fec195eacdf536a439fb2270a2747abf2 (diff) | |
| download | pygobject-ea76a3728bd50b2caa6a8134d32c38b13530d60f.tar.gz | |
CI: switch the xenial test job to Python 3
This job tests our oldest supported setup. Switch it to Python 3
so we can drop Python 2 support.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.old | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker-old.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/test-docker-old.sh | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f0149e0..ee89057a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,7 @@ pypy3.6: xenial-i386-py2: stage: build_and_test - image: registry.gitlab.gnome.org/gnome/pygobject/old:v2 + image: registry.gitlab.gnome.org/gnome/pygobject/old:v3 artifacts: paths: - coverage/ diff --git a/.gitlab-ci/Dockerfile.old b/.gitlab-ci/Dockerfile.old index fa135de7..7f53e40f 100644 --- a/.gitlab-ci/Dockerfile.old +++ b/.gitlab-ci/Dockerfile.old @@ -17,8 +17,8 @@ RUN apt-get update && apt-get install -y \ libgtk-3-0 \ libtool \ locales \ - python-dev \ - python-virtualenv \ + python3-dev \ + python3-venv \ xauth \ xvfb \ && rm -rf /var/lib/apt/lists/* diff --git a/.gitlab-ci/run-docker-old.sh b/.gitlab-ci/run-docker-old.sh index 4dd17520..6f6a1d68 100755 --- a/.gitlab-ci/run-docker-old.sh +++ b/.gitlab-ci/run-docker-old.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v2" +TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v3" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile.old" . diff --git a/.gitlab-ci/test-docker-old.sh b/.gitlab-ci/test-docker-old.sh index 91312c7c..8d451bc0 100755 --- a/.gitlab-ci/test-docker-old.sh +++ b/.gitlab-ci/test-docker-old.sh @@ -2,8 +2,8 @@ set -e -python --version -virtualenv --python=python _venv +python3 --version +python3 -m venv _venv source _venv/bin/activate # ccache setup |