Merge branch 'devops/add_updater_to_win_package' into 'dev'

Retrieve updater artifact and include in package

See merge request crafty-controller/crafty-4!446
This commit is contained in:
Iain Powrie 2022-09-04 02:17:57 +00:00
commit 5992aab250
2 changed files with 13 additions and 1 deletions

View File

@ -30,6 +30,11 @@ win-dev-build:
--collect-all tzdata
--collect-all pytz
--collect-all six
- |
echo "Retrieving 'latest' updater from crafty-controller/crafty-4-windows-updater"
$src = 'https://gitlab.com/crafty-controller/crafty-4-windows-updater/-/jobs/artifacts/dev/raw/crafty_updater.exe?job=win-dev-build'
$dest = 'crafty_updater.exe'
Invoke-WebRequest -Uri $src -OutFile $dest
# Download latest:
# | https://gitlab.com/crafty-controller/crafty-4/-/jobs/artifacts/dev/download?job=win-dev-build
@ -38,6 +43,7 @@ win-dev-build:
paths:
- app\
- .\crafty.exe
- .\crafty_updater.exe
exclude:
- app\classes\**\*
@ -72,6 +78,11 @@ win-prod-build:
--collect-all tzdata
--collect-all pytz
--collect-all six
- |
echo "Retrieving 'latest' updater from crafty-controller/crafty-4-windows-updater"
$src = 'https://gitlab.com/crafty-controller/crafty-4-windows-updater/-/jobs/artifacts/master/raw/crafty_updater.exe?job=win-prod-build'
$dest = 'crafty_updater.exe'
Invoke-WebRequest -Uri $src -OutFile $dest
after_script:
- Add-Content -Path job.env -Value "JOB_ID=$CI_JOB_ID"
@ -82,6 +93,7 @@ win-prod-build:
paths:
- app\
- .\crafty.exe
- .\crafty_updater.exe
expire_in: never
exclude:
- app\classes\**\*

View File

@ -1,7 +1,7 @@
# Changelog
## --- [4.0.12] - 2022/09/04
### New features
TBD
- Win Portable Updater will now be included in Windows Package ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/446))
### Bug fixes
- Fix performance issues on server metrics panels (Temporarily setting to 24hr query) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440))
- Fix no id on import3 servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/442))