Browse Source

Make the workflow work.

Martijn Laan 3 months ago
parent
commit
2f5e191b54
3 changed files with 10 additions and 4 deletions
  1. 8 2
      .github/workflows/build.yml
  2. 1 1
      build-ce.bat
  3. 1 1
      build.bat

+ 8 - 2
.github/workflows/build.yml

@@ -33,10 +33,14 @@ jobs:
       - name: build issrc
         run: |
           "set DELPHIXEROOT=$env:DELPHIXEROOT" | Out-File -Encoding ascii compilesettings.bat
-          "set ISSIGTOOL_KEY_FILE=${{github.workspace}}\home\bin\mykey.isprivatekey" | Out-File -NoNewline -Encoding ascii -Append compilesettings.bat
+          "set ISSIGTOOL_KEY_FILE=${{github.workspace}}\mykey.isprivatekey" | Out-File -NoNewline -Encoding ascii -Append compilesettings.bat
           "set DELPHIXEROOT=$env:DELPHIXEROOT" | Out-File -NoNewline -Encoding ascii ISHelp\ISHelpGen\compilesettings.bat
           "set HHCEXE=%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe" | Out-File -NoNewline -Encoding ascii ISHelp\compilesettings.bat
           .\build.bat
+      - name: Clean up temporary files
+        if: always()
+        shell: bash
+        run: rm -rf mykey.isprivatekey
       - name: copy license.txt into all artifacts
         run: |
           copy license.txt Files
@@ -56,7 +60,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ISHelp
-          path: ISHelp/Staging/
+          path: |
+            ISHelp/Staging/
+            ISHelp/Staging-dark/
       - name: find mt.exe
         shell: bash
         run: |

+ 1 - 1
build-ce.bat

@@ -120,7 +120,7 @@ echo Creating Inno Setup installer done
 call .\issig.bat sign output\innosetup-%VER%.exe
 if errorlevel 1 goto failed
 powershell.exe -NoProfile -Command "Write-Host -NoNewline 'SHA256 hash: '; (Get-FileHash -Algorithm SHA256 -Path output\innosetup-%VER%.exe).Hash.ToLower()"
-if errorlevel 1 goto failed
+rem ignoring error here
 
 echo All done!
 pause

+ 1 - 1
build.bat

@@ -105,7 +105,7 @@ echo Creating Inno Setup installer done
 call .\issig.bat sign output\innosetup-%VER%.exe
 if errorlevel 1 goto failed
 powershell.exe -NoProfile -Command "Write-Host -NoNewline 'SHA256 hash: '; (Get-FileHash -Algorithm SHA256 -Path output\innosetup-%VER%.exe).Hash.ToLower()"
-if errorlevel 1 goto failed
+rem ignoring error here
 
 echo All done!
 pause