diff options
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 7 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 | ||||
| -rw-r--r-- | README.rst | 2 |
4 files changed, 5 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3eefc51b..f7e27de1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +image: registry.gitlab.gnome.org/gnome/pygobject/main:v5 + stages: - build_and_test - coverage @@ -9,7 +11,6 @@ cache: .defaults: &defaults stage: build_and_test - image: registry.gitlab.gnome.org/gnome/pygobject/main:v4 artifacts: paths: - coverage/ @@ -29,7 +30,6 @@ cache: coverage: stage: coverage - image: registry.gitlab.gnome.org/gnome/pygobject/main:v4 artifacts: paths: - coverage/ @@ -40,7 +40,6 @@ coverage: pages: stage: deploy - image: registry.gitlab.gnome.org/gnome/pygobject/main:v4 dependencies: - coverage script: @@ -85,11 +84,6 @@ python2.7: PYENV_VERSION: "2.7.14" <<: *defaults -python3.4: - variables: - PYENV_VERSION: "3.4.8" - <<: *defaults - python3.5: variables: PYENV_VERSION: "3.5.5" diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index c1af1ce4..4b457a0b 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,7 +1,6 @@ -FROM ubuntu:artful +FROM ubuntu:bionic RUN apt-get update && apt-get install -y \ - autoconf-archive \ build-essential \ ccache \ curl \ @@ -17,10 +16,7 @@ RUN apt-get update && apt-get install -y \ libglib2.0-dev \ libgtk-3-0 \ libreadline-dev \ - libsqlite3-dev \ libssl-dev \ - libtool \ - locales \ xauth \ xvfb \ && rm -rf /var/lib/apt/lists/* @@ -40,7 +36,6 @@ ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}" RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash RUN pyenv install 2.7.14 -RUN pyenv install 3.4.8 RUN pyenv install 3.5.5 RUN pyenv install 3.6.5 RUN pyenv install 3.7.0b3 diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 818f3628..6f4f428c 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v4" +TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v5" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . @@ -18,7 +18,7 @@ <https://developer.gnome.org/gio/stable/>`__ and many more. It supports Linux, Windows and macOS and works with **Python 2.7+** as well as -**Python 3.4+**. PyGObject, including this documentation, is licensed under +**Python 3.5+**. PyGObject, including this documentation, is licensed under the **LGPLv2.1+**. ---- |