From 1353a5b4ee365a9187d623699291323836244bdb Mon Sep 17 00:00:00 2001 From: Faerbit Date: Thu, 19 Jan 2023 22:04:15 +0100 Subject: [PATCH] Revert "[ci] Just use whatever python version under windows" This reverts commit e55a8fee36642c5be3205d4c76021c3fb76460f0. --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f22ba0..eef3f8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,8 @@ prepare: before_script: - pip install setuptools_scm>=6.2 script: + - PYTHON_VERSION=$(python --version | cut -d " " -f2) + - echo "PYTHON_VERSION=${PYTHON_VERSION}" | tee -a build.env - VERSION=$(python -m setuptools_scm) - echo "VERSION=${VERSION}" | tee -a build.env - echo "LINUX_AMD64_BINARY=fime_linux_amd64_${VERSION}" | tee -a build.env @@ -50,9 +52,11 @@ update_windows_deps: - Pipfile - Pipfile.lock when: always + needs: + - prepare before_script: - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - - choco install python -y --no-progress + - choco install python --version=$PYTHON_VERSION -y --no-progress - refreshenv - python --version - pip install pipenv @@ -114,7 +118,7 @@ package_windows: - if: $CI_COMMIT_TAG before_script: - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - - choco install python -y --no-progress + - choco install python --version=$PYTHON_VERSION -y --no-progress - refreshenv - python --version - pip install pipenv