diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-04-01 01:13:09 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-04-01 01:14:26 +0200 |
| commit | 25fa14dc1bffa7489af741f40403442912d5d533 (patch) | |
| tree | 33ca75b04f23bfe52952753337cef8917c317705 | |
| parent | 1f0c2c0a0d2c76d0b2d351013bb14be092af45a6 (diff) | |
| download | pygobject-25fa14dc1bffa7489af741f40403442912d5d533.tar.gz | |
gitlab-ci: update pyenv versions and add pypy3 job
| -rw-r--r-- | .gitlab-ci.yml | 17 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 7 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ffa293d..15e0b359 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ cache: .defaults: &defaults stage: build_and_test - image: lazka/pygobject:pyenv + image: lazka/pygobject:v3 artifacts: paths: - coverage/ @@ -28,12 +28,12 @@ cache: coverage: stage: coverage - image: lazka/pygobject:pyenv + image: lazka/pygobject:v3 artifacts: paths: - coverage/ variables: - PYENV_VERSION: "3.6.4" + PYENV_VERSION: "3.6.5" script: - bash -x ./.gitlab-ci/coverage-docker.sh @@ -72,7 +72,7 @@ python2.7: python3.4: variables: - PYENV_VERSION: "3.4.7" + PYENV_VERSION: "3.4.8" <<: *defaults python3.5: @@ -82,12 +82,12 @@ python3.5: python3.6: variables: - PYENV_VERSION: "3.6.4" + PYENV_VERSION: "3.6.5" <<: *defaults python3.7: variables: - PYENV_VERSION: "3.7.0b2" + PYENV_VERSION: "3.7.0b3" <<: *defaults pypy2: @@ -95,6 +95,11 @@ pypy2: PYENV_VERSION: "pypy2.7-5.10.0" <<: *defaults +pypy3: + variables: + PYENV_VERSION: "pypy3.5-5.10.1" + <<: *defaults + xenial-i386-py2: stage: build_and_test image: lazka/pygobject:pyenv-old diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 9798b3e4..c1af1ce4 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -40,10 +40,11 @@ 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.7 +RUN pyenv install 3.4.8 RUN pyenv install 3.5.5 -RUN pyenv install 3.6.4 -RUN pyenv install 3.7.0b2 +RUN pyenv install 3.6.5 +RUN pyenv install 3.7.0b3 RUN pyenv install pypy2.7-5.10.0 +RUN pyenv install pypy3.5-5.10.1 ENV PATH="/usr/lib/ccache:${PATH}" diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 0b3757fc..5f8b7ea7 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,10 +2,10 @@ set -e -TAG="lazka/pygobject:pyenv" +TAG="lazka/pygobject:v3" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . -sudo docker run -e PYENV_VERSION='3.6.4' --rm \ +sudo docker run -e PYENV_VERSION='3.6.5' --rm \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ --tty --interactive "${TAG}" bash |