diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-07 17:13:06 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-07 17:13:06 +0200 |
| commit | 76d8dd697b06505513b3b9e06e43756373b6da0b (patch) | |
| tree | 36a60af5c4285a0b94a4b78241cab65948a26909 | |
| parent | c31ea9331a643ad114affd0c6761a404d0170259 (diff) | |
| download | pygobject-ci-py-update.tar.gz | |
ci: python updateci-py-update
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efed1968..5e899b5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/pygobject/main:v6 +image: registry.gitlab.gnome.org/gnome/pygobject/main:v7 stages: - build_and_test @@ -34,7 +34,7 @@ coverage: paths: - coverage/ variables: - PYENV_VERSION: "3.6.5" + PYENV_VERSION: "3.6.6" script: - bash -x ./.gitlab-ci/coverage-docker.sh @@ -91,12 +91,12 @@ python3.5: python3.6: variables: - PYENV_VERSION: "3.6.5" + PYENV_VERSION: "3.6.6" <<: *defaults python3.7: variables: - PYENV_VERSION: "3.7.0b3" + PYENV_VERSION: "3.7.0" <<: *defaults pypy2: diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index cd1aa1bb..cc9cff48 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -41,8 +41,8 @@ RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/p RUN pyenv install 2.7.15 RUN pyenv install 3.5.5 -RUN pyenv install 3.6.5 -RUN pyenv install 3.7.0b3 +RUN pyenv install 3.6.6 +RUN pyenv install 3.7.0 RUN pyenv install pypy2.7-6.0.0 RUN pyenv install pypy3.5-6.0.0 diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index aed88316..f80312da 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:v6" +TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v7" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . -sudo docker run -e PYENV_VERSION='3.6.5' --rm --security-opt label=disable \ +sudo docker run -e PYENV_VERSION='3.6.6' --rm --security-opt label=disable \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ --tty --interactive "${TAG}" bash |