[ci,windows] variables are fucky under windows

This commit is contained in:
Fabian 2022-09-27 21:12:17 +02:00
parent 0295f9a0cb
commit 872593f286
3 changed files with 8 additions and 24 deletions

View File

@ -21,6 +21,7 @@ prepare:
- pip install setuptools_scm>=6.2 - pip install setuptools_scm>=6.2
script: script:
- PYTHON_VERSION=$(python --version | cut -d " " -f2) - PYTHON_VERSION=$(python --version | cut -d " " -f2)
- echo "PYTHON_PATH=C:\\Python310\\python.exe" | tee -a build.env
- echo "PYTHON_VERSION=${PYTHON_VERSION}" | tee -a build.env - echo "PYTHON_VERSION=${PYTHON_VERSION}" | tee -a build.env
- VERSION=$(python -m setuptools_scm) - VERSION=$(python -m setuptools_scm)
- echo "VERSION=${VERSION}" | tee -a build.env - echo "VERSION=${VERSION}" | tee -a build.env
@ -51,15 +52,15 @@ package_windows:
- shared-windows - shared-windows
- windows - windows
- windows-1809 - windows-1809
variables:
PYTHON: "C:\\Python310\\python.exe"
before_script: before_script:
- choco install python --version=$PYTHON_VERSION -y --no-progress - choco install python --version=$PYTHON_VERSION -y --no-progress
- $PYTHON --version - $PYTHON_PATH --version
- $PYTHON -m pip install pipenv - $PYTHON_PATH -m pip install pipenv
- $PYTHON -m pipenv sync --dev - $PYTHON_PATH -m pipenv sync --dev
# for exe icon
- $PYTHON_PATH -m pipenv install pillow
script: script:
- $PYTHON -m pipenv run pyinstaller --onefile --name "${WINDOWS_AMD64_BINARY}" src/fime/main.py - $PYTHON_PATH -m pipenv run pyinstaller --onefile --windowed --name "${WINDOWS_AMD64_BINARY}" -i src/fime/icons/appointment-new.svg src/fime/main.py
artifacts: artifacts:
paths: paths:
- dist/fime_windows_* - dist/fime_windows_*

View File

@ -11,7 +11,6 @@ requests-futures = "~=1.0"
[dev-packages] [dev-packages]
pyinstaller = "~=5.1" pyinstaller = "~=5.1"
build = "~=0.8" build = "~=0.8"
setuptools_scm = "~=7.0"
[requires] [requires]
python_version = "3.10" python_version = "3.10"

18
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "44805faf23521c3b81f7051855e82b7ab7cf2f0a1d5442ceb03227f82171a620" "sha256": "a4a087796f175fb850f79cbb18fa4b5649ed809c714f0bce728e27ef263eb503"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@ -174,14 +174,6 @@
"markers": "python_version >= '3.7'", "markers": "python_version >= '3.7'",
"version": "==65.4.0" "version": "==65.4.0"
}, },
"setuptools-scm": {
"hashes": [
"sha256:031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844",
"sha256:7930f720905e03ccd1e1d821db521bff7ec2ac9cf0ceb6552dd73d24a45d3b02"
],
"index": "pypi",
"version": "==7.0.5"
},
"tomli": { "tomli": {
"hashes": [ "hashes": [
"sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
@ -189,14 +181,6 @@
], ],
"markers": "python_version < '3.11'", "markers": "python_version < '3.11'",
"version": "==2.0.1" "version": "==2.0.1"
},
"typing-extensions": {
"hashes": [
"sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02",
"sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6"
],
"markers": "python_version >= '3.7'",
"version": "==4.3.0"
} }
} }
} }