diff options
author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-03-27 16:33:58 +0100 |
---|---|---|
committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-03-27 19:47:53 +0100 |
commit | 0cfcc4352ec9efefec9d2d154c51372f6c1d2f0a (patch) | |
tree | d6068c6b1058867f9826b8ecc8625dc2730bd2a9 | |
parent | 82c170db6f52f55ce7b7c6e37cfd20495f0336ed (diff) | |
download | pygobject-0cfcc4352ec9efefec9d2d154c51372f6c1d2f0a.tar.gz |
CI: update interpreters
-rw-r--r-- | .gitlab-ci.yml | 20 | ||||
-rw-r--r-- | .gitlab-ci/Dockerfile | 11 | ||||
-rw-r--r-- | .gitlab-ci/Dockerfile.gtk4 | 4 | ||||
-rwxr-xr-x | .gitlab-ci/run-docker-gtk4.sh | 2 | ||||
-rwxr-xr-x | .gitlab-ci/run-docker.sh | 4 |
5 files changed, 17 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 819d19b5..d8c51d34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/pygobject/main:v10 +image: registry.gitlab.gnome.org/gnome/pygobject/main:v11 stages: - build_and_test @@ -81,12 +81,12 @@ python3-mingw64: python2.7: variables: - PYENV_VERSION: "2.7.15-debug" + PYENV_VERSION: "2.7.16-debug" <<: *defaults python3.5: variables: - PYENV_VERSION: "3.5.6" + PYENV_VERSION: "3.5.7" <<: *defaults python3.6: @@ -96,25 +96,19 @@ python3.6: python3.7: variables: - PYENV_VERSION: "3.7.2-debug" + PYENV_VERSION: "3.7.3-debug" <<: *defaults pypy2.7: allow_failure: true variables: - PYENV_VERSION: "pypy2.7-7.0.0" - <<: *defaults - -pypy3.5: - allow_failure: true - variables: - PYENV_VERSION: "pypy3.5-7.0.0" + PYENV_VERSION: "pypy2.7-7.1.0" <<: *defaults pypy3.6: allow_failure: true variables: - PYENV_VERSION: "pypy3.6-7.0.0" + PYENV_VERSION: "pypy3.6-7.1.0" <<: *defaults xenial-i386-py2: @@ -128,7 +122,7 @@ xenial-i386-py2: gtk4: stage: build_and_test - image: registry.gitlab.gnome.org/gnome/pygobject/gtk4:v3 + image: registry.gitlab.gnome.org/gnome/pygobject/gtk4:v4 artifacts: paths: - coverage/ diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 547b096f..8606ae13 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -39,12 +39,11 @@ 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.0.0 -RUN pyenv install pypy3.5-7.0.0 -RUN pyenv install pypy3.6-7.0.0 -RUN pyenv install --debug 2.7.15 -RUN pyenv install 3.5.6 +RUN pyenv install pypy2.7-7.1.0 +RUN pyenv install pypy3.6-7.1.0 +RUN pyenv install --debug 2.7.16 +RUN pyenv install 3.5.7 RUN pyenv install 3.6.8 -RUN pyenv install --debug 3.7.2 +RUN pyenv install --debug 3.7.3 ENV PATH="/usr/lib/ccache:${PATH}" diff --git a/.gitlab-ci/Dockerfile.gtk4 b/.gitlab-ci/Dockerfile.gtk4 index 95b9aff8..a1e60348 100644 --- a/.gitlab-ci/Dockerfile.gtk4 +++ b/.gitlab-ci/Dockerfile.gtk4 @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/pygobject/main:v10 +FROM registry.gitlab.gnome.org/gnome/pygobject/main:v11 USER root @@ -25,4 +25,4 @@ RUN git clone https://gitlab.gnome.org/GNOME/gtk.git \ && rm -Rf gtk USER user -ENV PYENV_VERSION 3.7.2-debug +ENV PYENV_VERSION 3.7.3-debug diff --git a/.gitlab-ci/run-docker-gtk4.sh b/.gitlab-ci/run-docker-gtk4.sh index b333020b..e2de0858 100755 --- a/.gitlab-ci/run-docker-gtk4.sh +++ b/.gitlab-ci/run-docker-gtk4.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/pygobject/gtk4:v3" +TAG="registry.gitlab.gnome.org/gnome/pygobject/gtk4:v4" sudo docker build --tag "${TAG}" --file "Dockerfile.gtk4" . sudo docker run --rm --security-opt label=disable \ diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 667f304d..c1d362b7 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:v10" +TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v11" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . -sudo docker run -e PYENV_VERSION='3.7.2-debug' --rm --security-opt label=disable \ +sudo docker run -e PYENV_VERSION='3.7.3-debug' --rm --security-opt label=disable \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ --tty --interactive "${TAG}" bash |