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.

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

[WIP] 278 usb reinsert gh actions #288

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
39e2060
Update automate_windows_build.yml
meenubhooshanan Oct 17, 2022
1ee45e3
Update automate_windows_build.yml
meenubhooshanan Oct 17, 2022
b75aead
Update automate_windows_build.yml
meenubhooshanan Oct 17, 2022
5cbc4d3
Update setup.iss
meenubhooshanan Oct 17, 2022
8a43150
Update automate_windows_build.yml
meenubhooshanan Oct 17, 2022
5e09905
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
0221647
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
6b523f2
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
ec51399
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
3a2b629
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
fe54e63
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
1d4b4c6
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
c36255a
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
c9091ff
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
93afdca
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
2149dcf
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
36112cb
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
8388d93
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
3aa2c70
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
dd0c2c8
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
85b2432
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
6a7f8f0
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
c7c12ec
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
04b6555
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
75ce179
Update setup.iss
meenubhooshanan Oct 18, 2022
78804ea
Update automate_windows_build.yml
meenubhooshanan Oct 18, 2022
c013c3a
Update automate_windows_build.yml
meenubhooshanan Oct 19, 2022
187e4e0
Update setup.iss
meenubhooshanan Oct 24, 2022
cde879f
Update setup.iss
meenubhooshanan Oct 25, 2022
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
9 changes: 3 additions & 6 deletions .github/workflows/automate_windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
22 changes: 3 additions & 19 deletions imls-windows-installer/setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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"; \
Expand Down Expand Up @@ -103,6 +88,8 @@ Filename: "{app}\service\WinSw-x64.exe"; \
var
IntroPage: TOutputMsgWizardPage;
LibraryPage: TInputQueryWizardPage;
ExitCode: Integer;
FullFilePath: String;

procedure InitializeWizard;
begin
Expand Down Expand Up @@ -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';
Expand Down