diff --git a/gitlab/functions.sh b/gitlab/functions.sh index ca37ba010a12dca6e1945c5f6d59f27d8d1187bf..8b6d09a7361acc6ca1673c2d8a36bfa2212cf72b 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -106,7 +106,7 @@ doc_upload() { log_info "Successfully uploaded ${1} with curl" } -check_env PYTHON_VER +check_env PYTHON_VERSION check_env CI_PROJECT_DIR check_env CI_PROJECT_PATH check_env CI_PROJECT_NAME @@ -156,7 +156,7 @@ else CXXFLAGS=${CFLAGS} fi -PYVER=py$(echo ${PYTHON_VER} | tr -d '.') +PYVER=py$(echo ${PYTHON_VERSION} | tr -d '.') BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-${PYVER} BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" diff --git a/templates/ci-for-cxx-extensions.yml b/templates/ci-for-cxx-extensions.yml index dfeb26f035ee69843c1d1ae3cdf1bdc7bf82c670..a61544c8608e1a9bfadf1cf26f7adab0922ef20e 100644 --- a/templates/ci-for-cxx-extensions.yml +++ b/templates/ci-for-cxx-extensions.yml @@ -108,7 +108,7 @@ stages: build_linux_27: <<: *build_job variables: &linux_27_build_variables - PYTHON_VER: "2.7" + PYTHON_VERSION: "2.7" tags: - conda-linux @@ -132,7 +132,7 @@ wheels_linux_27: build_linux_34: <<: *build_job variables: &linux_34_build_variables - PYTHON_VER: "3.4" + PYTHON_VERSION: "3.4" tags: - conda-linux @@ -149,7 +149,7 @@ test_linux_34: build_linux_35: <<: *build_job variables: &linux_35_build_variables - PYTHON_VER: "3.5" + PYTHON_VERSION: "3.5" tags: - conda-linux @@ -188,7 +188,7 @@ deploy_linux_35: build_macosx_27: <<: *build_job variables: &macosx_27_build_variables - PYTHON_VER: "2.7" + PYTHON_VERSION: "2.7" tags: - conda-macosx @@ -205,7 +205,7 @@ test_macosx_27: build_macosx_34: <<: *build_job variables: &macosx_34_build_variables - PYTHON_VER: "3.4" + PYTHON_VERSION: "3.4" tags: - conda-macosx @@ -222,7 +222,7 @@ test_macosx_34: build_macosx_35: <<: *build_job variables: &macosx_35_build_variables - PYTHON_VER: "3.5" + PYTHON_VERSION: "3.5" tags: - conda-macosx diff --git a/templates/ci-for-python-only.yml b/templates/ci-for-python-only.yml index 84dcfa0d045640a66922584136fe99bf7b610850..4b2313051da85dffb0521539e4eb330d10224d93 100644 --- a/templates/ci-for-python-only.yml +++ b/templates/ci-for-python-only.yml @@ -108,7 +108,7 @@ stages: build_linux_27: <<: *build_job variables: &linux_27_build_variables - PYTHON_VER: "2.7" + PYTHON_VERSION: "2.7" WHEEL_TAG: "py27" tags: - conda-linux @@ -133,7 +133,7 @@ wheels_linux_27: build_linux_34: <<: *build_job variables: &linux_34_build_variables - PYTHON_VER: "3.4" + PYTHON_VERSION: "3.4" WHEEL_TAG: "py3" tags: - conda-linux @@ -151,7 +151,7 @@ test_linux_34: build_linux_35: <<: *build_job variables: &linux_35_build_variables - PYTHON_VER: "3.5" + PYTHON_VERSION: "3.5" WHEEL_TAG: "py3" tags: - conda-linux @@ -191,7 +191,7 @@ deploy_linux_35: build_macosx_27: <<: *build_job variables: &macosx_27_build_variables - PYTHON_VER: "2.7" + PYTHON_VERSION: "2.7" WHEEL_TAG: "py27" tags: - conda-macosx @@ -209,7 +209,7 @@ test_macosx_27: build_macosx_34: <<: *build_job variables: &macosx_34_build_variables - PYTHON_VER: "3.4" + PYTHON_VERSION: "3.4" WHEEL_TAG: "py3" tags: - conda-macosx @@ -227,7 +227,7 @@ test_macosx_34: build_macosx_35: <<: *build_job variables: &macosx_35_build_variables - PYTHON_VER: "3.5" + PYTHON_VERSION: "3.5" WHEEL_TAG: "py3" tags: - conda-macosx