diff options
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 10 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee89057a..33d6bc59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/pygobject/main:v11 +image: registry.gitlab.gnome.org/gnome/pygobject/main:v12 stages: - build_and_test @@ -34,7 +34,7 @@ coverage: paths: - coverage/ variables: - PYENV_VERSION: "3.6.8" + PYENV_VERSION: "3.6.9" script: - bash -x ./.gitlab-ci/coverage-docker.sh @@ -77,29 +77,29 @@ python3.5: python3.6: variables: - PYENV_VERSION: "3.6.8" + PYENV_VERSION: "3.6.9" <<: *defaults python3.7: variables: - PYENV_VERSION: "3.7.3-debug" + PYENV_VERSION: "3.7.4-debug" <<: *defaults python3.8: variables: - PYENV_VERSION: "3.8-dev-debug" + PYENV_VERSION: "3.8.0-debug" <<: *defaults pypy2.7: allow_failure: true variables: - PYENV_VERSION: "pypy2.7-7.1.0" + PYENV_VERSION: "pypy2.7-7.2.0" <<: *defaults pypy3.6: allow_failure: true variables: - PYENV_VERSION: "pypy3.6-7.1.0" + PYENV_VERSION: "pypy3.6-7.2.0" <<: *defaults xenial-i386-py2: diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index eaaa484a..fdcb0379 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -39,12 +39,12 @@ 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.1.0 -RUN pyenv install pypy3.6-7.1.0 +RUN pyenv install pypy2.7-7.2.0 +RUN pyenv install pypy3.6-7.2.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.3 -RUN pyenv install --debug 3.8-dev +RUN pyenv install 3.6.9 +RUN pyenv install --debug 3.7.4 +RUN pyenv install --debug 3.8.0 ENV PATH="/usr/lib/ccache:${PATH}" diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index c1d362b7..cfcaab30 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:v11" +TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v12" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . -sudo docker run -e PYENV_VERSION='3.7.3-debug' --rm --security-opt label=disable \ +sudo docker run -e PYENV_VERSION='3.7.4-debug' --rm --security-opt label=disable \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ --tty --interactive "${TAG}" bash |