From dd15b80f7b3aacfd3f505267e1895700595d8136 Mon Sep 17 00:00:00 2001 From: Vladimir Borisov Date: Wed, 17 Apr 2024 11:28:23 +0300 Subject: [PATCH] Installer fixes --- .github/workflows/build.yml | 15 +++++++++++++-- images/windows-installer-header.bmp | Bin 34254 -> 13134 bytes setup/Stremio.iss | 4 +++- setup/create_setup.bat | 3 +-- setup/get_exe_from_zip.ps1 | 26 -------------------------- 5 files changed, 17 insertions(+), 31 deletions(-) delete mode 100644 setup/get_exe_from_zip.ps1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 562dfc0..2b92333 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,19 @@ jobs: run: cargo build --release - name: Build the setup proggam run: | - & 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' '/Sstremiosign=$qC:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86\signtool.exe$q sign /f $q${{ github.workspace }}\certificates\smartcode-20211118-20241118.pfx$q /p ${{ secrets.WIN_CERT_PASSWORD }} /v $f' '${{ github.workspace }}\setup\Stremio.iss' + & 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' /DSIGN '/Sstremiosign=$qC:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86\signtool.exe$q sign /f $q${{ github.workspace }}\certificates\smartcode-20211118-20241118.pfx$q /p ${{ secrets.WIN_CERT_PASSWORD }} /v $f' '${{ github.workspace }}\setup\Stremio.iss' + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }} + aws-region: eu-west-1 + + - name: Upload to Amazon S3 + run: | + aws s3 cp --acl public-read StremioSetup*.exe s3://stremio-artifacts/stremio-shell-ng/${{ github.ref_name }}/ + - uses: actions/upload-artifact@v3 with: name: stremio-setup - path: Stremio*.exe + path: StremioSetup*.exe diff --git a/images/windows-installer-header.bmp b/images/windows-installer-header.bmp index 02b3b9fd4302bf5eb5bddf2f1e85c35536927481..7c91914b42a9dab3c5a2116e8f6163ea0d70086e 100644 GIT binary patch delta 372 zcma(|!7BuD6#ngE4i1AzO2Q;1)V4&MlqR(i+qRok+ct$7+ulTSki9u@{Qdw=dvGA5 zD5ptsoIilnYwY12yw|vt~=MJOGe>vU?#?<|cqv56R6a52({Xs&{a2MR658*G^BZTKsf^HCY zCkT&|gzhPVHBE4430i_sOcHMA3GqcjAw{@ZA~co>xfMdqtfR47M`oqcrC$7&s^X)akJ?_OO|0A3u*wYYK!aQHg~!`JSLLU0 VXGq2s9b^(mKF*K%!9V%#`~zk;h;aY_ delta 427 zcmX??cCMRA$I16xD+3sq0Z9!Yo(9C0K+MRX03;#c2ps9)ravaYOh;JPl64UlM@uHwi-M zNkS01NEku~i9l#0Q3x$02BAMe=}Y1e{w4_sJxTHj*d1k35IRcw1(@$71EIBKA+(Sj zg#HDkAIU@brxYOcCPfH6O9?_ZDMRQi6$l-q3ZbpkAheP?gyzzK(4V06ElmjjkQRhq Yr46Ac=|JczT`;{lN$(8{B(U=s0i0>PQUCw| diff --git a/setup/Stremio.iss b/setup/Stremio.iss index 8c37e4d..48a9e6d 100644 --- a/setup/Stremio.iss +++ b/setup/Stremio.iss @@ -38,7 +38,7 @@ DisableDirPage=yes DisableProgramGroupPage=yes ; DisableFinishedPage=yes ChangesAssociations=yes -OutputBaseFilename={#MyAppName} {#MyAppVersion} +OutputBaseFilename={#MyAppName}Setup-v{#MyAppVersion} OutputDir=.. Compression=lzma SolidCompression=yes @@ -50,8 +50,10 @@ WizardImageFile={#SourcePath}..\images\windows-installer.bmp WizardSmallImageFile={#SourcePath}..\images\windows-installer-header.bmp SetupIconFile={#SourcePath}..\images\stremio.ico UninstallDisplayIcon={app}\{#MyAppExeName},0 +#ifdef SIGN SignTool=stremiosign SignedUninstaller=yes +#endif [Code] function InitializeSetup: Boolean; diff --git a/setup/create_setup.bat b/setup/create_setup.bat index 9ba9201..7284d7a 100644 --- a/setup/create_setup.bat +++ b/setup/create_setup.bat @@ -9,5 +9,4 @@ if not exist "%mypath%..\target\release\stremio-shell-ng.exe" ( ) :: Compile the installer -:: "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "%mypath%Stremio.iss" -"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "/Sstremiosign=$qC:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86\signtool.exe$q sign /f $q${{ github.workspace }}\certificates\smartcode-20211118-20241118.pfx$q /p ${{ secrets.WIN_CERT_PASSWORD }} /v $f" "%mypath%Stremio.iss" \ No newline at end of file +"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "%mypath%Stremio.iss" diff --git a/setup/get_exe_from_zip.ps1 b/setup/get_exe_from_zip.ps1 deleted file mode 100644 index 0e548b0..0000000 --- a/setup/get_exe_from_zip.ps1 +++ /dev/null @@ -1,26 +0,0 @@ -# This file downloads zip files and takes any executables from them. - -$files = @( - "https://github.com/vot/ffbinaries-prebuilt/releases/download/v3.3/ffmpeg-3.3.4-win-32.zip" - "https://github.com/vot/ffbinaries-prebuilt/releases/download/v3.3/ffprobe-3.3.4-win-32.zip" - "https://nodejs.org/dist/v16.17.0/node-v16.17.0-win-x86.zip" -) - -New-Item -Path ".\bin" -ItemType Directory -Force -$archives = @() -$workers = foreach ($url in $files) { - $fn = ([uri]$url).Segments[-1] - $archives += $fn - $wc = New-Object System.Net.WebClient - Write-Output $wc.DownloadFileTaskAsync($url, $fn) -} - -# wait until all files are downloaded -$workers.Result - -foreach ($f in $archives) { - Expand-Archive -Path $f -DestinationPath ".\temp" -Force -PassThru | Where-Object { $_.Name.EndsWith(".exe") -and -not $_.Name.StartsWith(".")} | Copy-Item -Destination ".\bin\" - Remove-Item $f -} - -Remove-Item ".\temp" -Recurse \ No newline at end of file