diff options
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 10 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97a3cae0..a1a1a9b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/pygobject/main:v17 +image: registry.gitlab.gnome.org/gnome/pygobject/main:v18 stages: - build_and_test @@ -35,7 +35,7 @@ coverage: paths: - coverage/ variables: - PYENV_VERSION: "3.7.11-debug" + PYENV_VERSION: "3.7.13-debug" script: - bash -x ./.gitlab-ci/coverage-docker.sh @@ -64,28 +64,28 @@ mingw64: python3.7: variables: - PYENV_VERSION: "3.7.11-debug" + PYENV_VERSION: "3.7.13-debug" <<: *defaults python3.8: variables: - PYENV_VERSION: "3.8.12-debug" + PYENV_VERSION: "3.8.13-debug" <<: *defaults python3.9: variables: - PYENV_VERSION: "3.9.7-debug" + PYENV_VERSION: "3.9.12-debug" <<: *defaults python3.10: variables: - PYENV_VERSION: "3.10.0rc2-debug" + PYENV_VERSION: "3.10.4-debug" <<: *defaults -pypy3.7: +pypy3.8: allow_failure: true variables: - PYENV_VERSION: "pypy3.7-7.3.5" + PYENV_VERSION: "pypy3.8-7.3.8" <<: *defaults old-i386-py3: diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 5a4e0e72..9a950083 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -41,10 +41,10 @@ ENV PYTHON_CONFIGURE_OPTS="--enable-shared" RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash -RUN pyenv install pypy3.7-7.3.5 -RUN pyenv install --debug 3.7.11 -RUN pyenv install --debug 3.8.12 -RUN pyenv install --debug 3.9.7 -RUN pyenv install --debug 3.10.0rc2 +RUN pyenv install pypy3.8-7.3.8 +RUN pyenv install --debug 3.7.13 +RUN pyenv install --debug 3.8.13 +RUN pyenv install --debug 3.9.12 +RUN pyenv install --debug 3.10.4 ENV PATH="/usr/lib/ccache:${PATH}" diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index e6aaaa0b..5ad020e9 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:v17" +TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v18" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . -sudo docker run -e PYENV_VERSION='3.8.12-debug' --rm --security-opt label=disable \ +sudo docker run -e PYENV_VERSION='3.8.13-debug' --rm --security-opt label=disable \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ --tty --interactive "${TAG}" bash |