diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 1f24d5c2..c24f6a0b 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -18,13 +18,13 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: windows-latest + runs-on: windows-2019 # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - + - name: Download the prerequisite software run: | cd imls-windows-installer @@ -33,10 +33,7 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - Get-Content setup.iss - cd 'Inno Setup 6' - ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' - + iscc setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 with: diff --git a/imls-windows-installer/setup.iss b/imls-windows-installer/setup.iss index db7a23b8..d927307b 100644 --- a/imls-windows-installer/setup.iss +++ b/imls-windows-installer/setup.iss @@ -53,26 +53,11 @@ Source:"WinSw-x64.exe"; \ Source:"WinSw-x64.xml"; \ DestDir: "{app}\service"; \ Flags: ignoreversion -; Wireshark 3.6.5 portable app -Source:"WiresharkPortable64_3.6.5.paf.exe"; \ - DestDir: "{app}\Wireshark"; \ - Flags: ignoreversion -Source:"npcap-1.60.exe"; \ - DestDir: "{app}\Wireshark"; \ - Flags: ignoreversion [Run] ;Filename: "{app}\{#MySecondaryAppExeName}"; \ ;Description: "wifi-hardware-search-windows"; \ ;Flags: runascurrentuser -Filename: "{app}\Wireshark\WiresharkPortable64_3.6.5.paf.exe"; \ - Description: "Wireshark 3.6.5"; \ - Parameters: "\D C:\imls"; \ - Flags: runascurrentuser -Filename: "{app}\Wireshark\npcap-1.60.exe"; \ - Description: "npcap 1.60"; \ - Parameters: "\D C:\imls"; \ - Flags: runascurrentuser Filename: "{app}\service\WinSw-x64.exe"; \ Parameters: "install"; \ Description: "WinSw-x64 install"; \ @@ -103,6 +88,8 @@ Filename: "{app}\service\WinSw-x64.exe"; \ var IntroPage: TOutputMsgWizardPage; LibraryPage: TInputQueryWizardPage; + ExitCode: Integer; + FullFilePath: String; procedure InitializeWizard; begin @@ -203,12 +190,9 @@ begin SetIniString('device', 'fscs_id', LibraryPage.Values[1], ExpandConstant(CurrentFileName)); end; -var - ExitCode: Integer; - FullFilePath: String; - procedure CurStepChanged(CurStep: TSetupStep); begin + Log('CurStepChanged(' + IntToStr(Ord(CurStep)) + ') called'); if CurStep = ssInstall then begin FullFilePath:= GetCurrentDir + '\wifi-hardware-search-windows.exe';