diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4adbde8..dc3f84b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,12 @@ jobs: curl -L --output-dir .build/drivers/ -O https://raw.githubusercontent.com/qmk/qmk_firmware/master/util/drivers.txt curl -L --output-dir .build/drivers/ -O https://github.com/qmk/qmk_driver_installer/releases/download/v1.01/qmk_driver_installer.exe + - name: Download Visual C++ Redistributable + shell: bash + run: | + mkdir .build/vcredist/ + curl -L --output-dir .build/vcredist/ -O http://download.microsoft.com/download/c/c/2/cc2df5f8-4454-44b4-802d-5ea68d086676/vcredist_x64.exe + - name: Update MSYS run: | .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman -Syu --noconfirm || true" diff --git a/installer/install.iss b/installer/install.iss index 4bb3439..1f3225f 100644 --- a/installer/install.iss +++ b/installer/install.iss @@ -43,11 +43,13 @@ Name: "installdrivers"; Description: "Install drivers"; GroupDescription: "Other Source: ".\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "..\.build\msys64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "..\.build\drivers\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\.build\vcredist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs [Dirs] Name:"{app}\"; Permissions:everyone-modify [Run] +Filename: "{app}\vcredist_x64.exe"; WorkingDir: "{app}"; Parameters: " /install /quiet /norestart"; StatusMsg: "Installing Visual C++ Redistributable..."; Flags: runhidden Filename: "{app}\qmk_driver_installer.exe"; WorkingDir: "{app}"; Parameters: " --all --force drivers.txt"; StatusMsg: "Installing Drivers..."; Tasks: installdrivers; Flags: runhidden [Icons]