Commit 6c312e9f authored by Christoph Reiter's avatar Christoph Reiter 馃悕

ci: update to PyPy 7.0 and update CPython to the latest stable releases

parent 00d7753c
image: registry.gitlab.gnome.org/gnome/pygobject/main:v9
image: registry.gitlab.gnome.org/gnome/pygobject/main:v10
stages:
- build_and_test
......@@ -34,7 +34,7 @@ coverage:
paths:
- coverage/
variables:
PYENV_VERSION: "3.6.7"
PYENV_VERSION: "3.6.8"
script:
- bash -x ./.gitlab-ci/coverage-docker.sh
......@@ -91,24 +91,24 @@ python3.5:
python3.6:
variables:
PYENV_VERSION: "3.6.7"
PYENV_VERSION: "3.6.8"
<<: *defaults
python3.7:
variables:
PYENV_VERSION: "3.7.1-debug"
PYENV_VERSION: "3.7.2-debug"
<<: *defaults
pypy2:
allow_failure: true
variables:
PYENV_VERSION: "pypy2.7-6.0.0"
PYENV_VERSION: "pypy2.7-7.0.0"
<<: *defaults
pypy3:
allow_failure: true
variables:
PYENV_VERSION: "pypy3.5-6.0.0"
PYENV_VERSION: "pypy3.5-7.0.0"
<<: *defaults
xenial-i386-py2:
......@@ -122,7 +122,7 @@ xenial-i386-py2:
gtk4:
stage: build_and_test
image: registry.gitlab.gnome.org/gnome/pygobject/gtk4:v2
image: registry.gitlab.gnome.org/gnome/pygobject/gtk4:v3
artifacts:
paths:
- coverage/
......
......@@ -39,11 +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 --debug 2.7.15
RUN pyenv install 3.5.6
RUN pyenv install 3.6.7
RUN pyenv install --debug 3.7.1
RUN pyenv install pypy2.7-6.0.0
RUN pyenv install pypy3.5-6.0.0
RUN pyenv install 3.6.8
RUN pyenv install --debug 3.7.2
ENV PATH="/usr/lib/ccache:${PATH}"
FROM registry.gitlab.gnome.org/gnome/pygobject/main:v9
FROM registry.gitlab.gnome.org/gnome/pygobject/main:v10
USER root
RUN python3 -m pip install meson
RUN python3 -m pip install meson==0.49.2
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
......@@ -25,4 +25,4 @@ RUN git clone https://gitlab.gnome.org/GNOME/gtk.git \
&& rm -Rf gtk
USER user
ENV PYENV_VERSION 3.7.1-debug
ENV PYENV_VERSION 3.7.2-debug
......@@ -2,7 +2,7 @@
set -e
TAG="registry.gitlab.gnome.org/gnome/pygobject/gtk4:v2"
TAG="registry.gitlab.gnome.org/gnome/pygobject/gtk4:v3"
sudo docker build --tag "${TAG}" --file "Dockerfile.gtk4" .
sudo docker run --rm --security-opt label=disable \
......
......@@ -2,10 +2,10 @@
set -e
TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v9"
TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v10"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
sudo docker run -e PYENV_VERSION='3.7.1-debug' --rm --security-opt label=disable \
sudo docker run -e PYENV_VERSION='3.7.2-debug' --rm --security-opt label=disable \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
--tty --interactive "${TAG}" bash
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment