From 6a85843d9f80fe81f45ac5d9bb85cb279148bc6c Mon Sep 17 00:00:00 2001 From: Faerbit Date: Thu, 29 Feb 2024 20:40:58 +0100 Subject: [PATCH] --keep-outdated has been deprecated / removed --- .gitlab-ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f60da0..cecd331 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,10 +58,13 @@ update_windows_deps: - python --version - pip install pipenv script: - - pipenv lock --dev --keep-outdated + - cp Pipfile.lock Pipfile.lock.bak + - pipenv lock --dev + - cp Pipfile.lock Pipfile.lock.windows + - mv Pipfile.lock.bak Pipefile.lock artifacts: paths: - - Pipfile.lock + - Pipfile.lock.windows # commit from linux, because setting up SSH in Windows is a fucking nightmare commit_windows_deps: @@ -84,8 +87,8 @@ commit_windows_deps: - git config --global user.email "ci@gitlab.com" - git remote rm origin && git remote add origin "git@gitlab.com:${CI_PROJECT_PATH}.git" script: - - dos2unix Pipfile.lock - - git commit -m "Updated windows deps from CI" Pipfile.lock || echo "No changes" + - dos2unix Pipfile.lock.windows + - git commit -m "Updated windows deps from CI" Pipfile.lock.windows || echo "No changes" - GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git push origin HEAD:$CI_COMMIT_REF_NAME package_linux: @@ -119,6 +122,7 @@ package_windows: - refreshenv - python --version - pip install pipenv + - mv Pipenv.lock.windows Pipenv.lock - pipenv sync --dev script: - pipenv run pyinstaller --onefile --windowed --name "${WINDOWS_AMD64_BINARY}" -i icon.ico src/fime/main.py