ci: python update

GNOME · Jul 7, 2018 · 76d8dd6 · 76d8dd6
1 parent c31ea93
commit 76d8dd6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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