Skip to content

Commit

Permalink
fix #407 showing proper version in windows binary (#431)
Browse files Browse the repository at this point in the history
  • Loading branch information
k9ert committed Sep 23, 2020
1 parent 9ec7e14 commit 91fe223
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
9 changes: 7 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,10 @@ release_binary_windows:
- pip3 install github-binary-upload
- cd pyinstaller
- .\build-win.bat $CI_COMMIT_TAG
- docker run --rm -i -v ${pwd}:/work k9ert/innosetup iscc /work/specter-desktop.iss /DMyAppVersion="$Env:CI_COMMIT_TAG"
- echo $Env:GH_BIN_UPLOAD_PW | docker run -i -v ${pwd}:/work k9ert/github-binary-upload:latest -u gitlab_upload_release_binaries cryptoadvance/specter-desktop $Env:CI_COMMIT_TAG ./release/specter_desktop_setup.exe
- (Get-Content .\specter-desktop.iss).replace('#define MyAppVersion "x.y.z"',"#define MyAppVersion `"$Env:CI_COMMIT_TAG`"") | Set-Content .\specter-desktop.iss
- docker run --rm -i -v ${pwd}:/work k9ert/innosetup iscc /work/specter-desktop.iss
- Get-FileHash specter_desktop_setup.exe -Algorithm SHA256 > .\release\specter_desktop_setup.exe.SHA256
- echo $Env:GH_BIN_UPLOAD_PW | docker run -i -v ${pwd}:/work k9ert/github-binary-upload:latest -u gitlab_upload_release_binaries cryptoadvance/specter-desktop $Env:CI_COMMIT_TAG ./release/specter_desktop_setup.exe ./release/specter_desktop_setup.exe.SHA256



5 changes: 3 additions & 2 deletions pyinstaller/specter-desktop.iss
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
; Maybe we should remove the next 3 lines altogether
; See https://stackoverflow.com/questions/13423317/inno-setup-ide-and-iscc-ispp-passing-define
; for reasoning
; So this can now be overridden via iscc ... /DMyAppVersion="v0.7.2",
; So this can now be overridden via iscc ... /DMyAppVersion="v0.7.2"
; as it didn't work, we're replacing it directly in the file
#ifndef myarg
#define MyAppVersion "0.7.2"
#define MyAppVersion "x.y.z"
#endif
#define MyAppPublisher "CryptoAdvance GmbH"
#define MyAppURL "https://github.com/cryptoadvance/specter-desktop/"
Expand Down

0 comments on commit 91fe223

Please sign in to comment.