diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-09-14 09:48:58 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-09-14 09:53:55 +0200 |
| commit | 6ffc87e51694abd03aed2d42683d65caa74e313d (patch) | |
| tree | c1c0047317f0051b53005c0dcdf366aed04750ba /.gitlab-ci | |
| parent | 12930c0eba55edec6e91bcde115a90cf959afbe0 (diff) | |
| download | pygobject-6ffc87e51694abd03aed2d42683d65caa74e313d.tar.gz | |
Drop Python 3.5 support and bump other dependenciesdrop-py35
Motivated by the EOL of Python 3.5 and the EOL of Ubuntu 16.04 next year
this requires Python 3.6 and moves all other dependencies to what is available in
Ubuntu 18.04.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 15 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.old | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker-old.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 4 |
4 files changed, 13 insertions, 12 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 75d66d87..5c490b60 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,4 +1,6 @@ -FROM ubuntu:cosmic +FROM ubuntu:focal + +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y \ build-essential \ @@ -39,12 +41,9 @@ ENV PYTHON_CONFIGURE_OPTS="--enable-shared" RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash -RUN pyenv install pypy2.7-7.3.0 -RUN pyenv install pypy3.6-7.3.0 -RUN pyenv install --debug 2.7.17 -RUN pyenv install 3.5.9 -RUN pyenv install 3.6.10 -RUN pyenv install --debug 3.7.6 -RUN pyenv install --debug 3.8.1 +RUN pyenv install pypy3.6-7.3.1 +RUN pyenv install 3.6.12 +RUN pyenv install --debug 3.7.9 +RUN pyenv install --debug 3.8.5 ENV PATH="/usr/lib/ccache:${PATH}" diff --git a/.gitlab-ci/Dockerfile.old b/.gitlab-ci/Dockerfile.old index 7f53e40f..beffb9be 100644 --- a/.gitlab-ci/Dockerfile.old +++ b/.gitlab-ci/Dockerfile.old @@ -1,4 +1,6 @@ -FROM i386/ubuntu:xenial +FROM i386/ubuntu:bionic + +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y \ autoconf-archive \ diff --git a/.gitlab-ci/run-docker-old.sh b/.gitlab-ci/run-docker-old.sh index 6f6a1d68..bd11cbff 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:v3" +TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v4" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile.old" . diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 148e5f40..9207a4a4 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,10 +2,10 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v13" +TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v14" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . -sudo docker run -e PYENV_VERSION='3.8.1-debug' --rm --security-opt label=disable \ +sudo docker run -e PYENV_VERSION='3.8.5-debug' --rm --security-opt label=disable \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ --tty --interactive "${TAG}" bash |