Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix the windows installer auto build #5939

Merged
merged 2 commits into from
Nov 10, 2023
Merged

fix: fix the windows installer auto build #5939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
063a4c6
tari -> minotari
hansieodendaal Nov 10, 2023
0676acf
review comments
hansieodendaal Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/base_node_binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,14 @@ jobs:
run: |
cd buildtools
call generate_config.bat
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer" "/DTariSuitePath=${{ github.workspace }}${{ env.TBN_DIST }}" "windows_inno_installer.iss"
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer" "/DMinotariSuite=env.TBN_FILENAME" "/DTariSuitePath=${{ github.workspace }}${{ env.TBN_DIST }}" "windows_inno_installer.iss"
cd Output
echo "Compute archive shasum"
${{ env.SHARUN }} "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe" >> "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
${{ env.SHARUN }} "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe" >> "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
echo "Show the shasum"
cat "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
cat "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
echo "Checkum verification archive is "
${{ env.SHARUN }} --check "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
${{ env.SHARUN }} --check "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"

- name: Artifact upload for Windows installer
uses: actions/upload-artifact@v3
Expand Down
10 changes: 4 additions & 6 deletions buildtools/windows_inno_installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@
; - "<path to console-mode compiler>\ISCC.exe" "/SSignTool=signtool sign
; /tr http://timestamp.digicert.com /f "<path and filename of the certificate>"
; /p <password used to create the certificate> $f"
; "/DMyAppVersion=<base node version>" "windows_inno_installer.iss"
; "/DMyAppVersion=<version>" "/DMinotariSuite=<suite>" "windows_inno_installer.iss"
; (4) Windows shortcuts
; - To edit any of the *.lnk* files, first copy their icons
; "<project_root>/buildtools/*.ico" to "%USERPROFILE%\temp\tari_icons"


#define MyOrgName "Tari"
;#define MyAppVersion "?.?.?-???????-release"
#define MyAppPublisher "The Tari Development Community"
#define MyAppURL "https://github.com/tari-project/tari"
#define MyAppSupp "Tari Website"
Expand All @@ -49,7 +48,7 @@
#define MergeMiningExeName "start_xmrig.bat"
#define ReadmeName "README.txt"
#ifndef TariSuitePath
#define public TariSuitePath "..\target\release"
#define public TariSuitePath "..\target\release"
#endif

[Setup]
Expand All @@ -59,7 +58,6 @@
AppId={{35C6E863-EDE5-4CBD-A824-E1418ECB1D1D}
AppName={#MyOrgName} {#BaseNodeName}
AppVersion={#MyAppVersion}
;AppVerName={#BaseNodeName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppSuppURL}
Expand All @@ -68,7 +66,7 @@ DefaultDirName={userdocs}\..\.tari-testnet
DefaultGroupName={#MyOrgName} - Testnet
AllowNoIcons=yes
LicenseFile=..\LICENSE
OutputBaseFilename=tari_suite-{#MyAppVersion}
OutputBaseFilename={#MinotariSuite}-{#MyAppVersion}
SetupIconFile=.\tari_logo_black.ico
Compression=lzma
SolidCompression=yes
Expand Down Expand Up @@ -143,7 +141,7 @@ Name: "{group}\Start {#MergeMiningProxyName}"; Filename: "{app}\runtime\{#MergeM
Name: "{group}\Start {#MergeMiningName}"; Filename: "{app}\runtime\{#MergeMiningExeName}"; WorkingDir: "{app}"
Name: "{group}\Start {#TorServicesName}"; Filename: "{app}\runtime\{#TorServicesExeName}"; WorkingDir: "{app}"
Name: "{group}\{#ReadmeName}"; Filename: "{app}\{#ReadmeName}"; WorkingDir: "{app}"
Name: "{group}\{cm:ProgramOnTheWeb,{#BaseNodeName}}"; Filename: "{#MyAppURL}"
Name: "{group}\{cm:TariGit,{#BaseNodeName}}"; Filename: "{#MyAppURL}"
Name: "{group}\{cm:TariWeb,{#MyAppSupp}}"; Filename: "{#MyAppSuppURL}"
Name: "{group}\{cm:UninstallProgram,{#MyOrgName} - Testnet}"; Filename: "{uninstallexe}"
Name: "{userdesktop}\{#MyOrgName} {#AllName}"; Filename: "{app}\runtime\{#AllExeName}"; WorkingDir: "{app}"; Tasks: desktopicon
Expand Down
Loading