Skip to content

Commit

Permalink
Attempt to fix the VC redist installation issues
Browse files Browse the repository at this point in the history
- Try to avoid comparing against a hash from when the installer was built, since MS frequently updates the redist installer from that link. The normal signature verification can be used
- Remove caching of the redist for the CI builds, since this resulted in it never being updated.

#305
  • Loading branch information
cameronwhite committed Sep 2, 2020
1 parent 4fee418 commit 43ec269
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,7 @@ jobs:

- uses: microsoft/[email protected]

- name: Cache VC redist
id: cache-redist
uses: actions/cache@v2
with:
path: installer/windows/redist/vc_redist.x64.exe
key: ${{ runner.os }}-redist-v1

- name: Fetch VC redist
if: steps.cache-redist.outputs.cache-hit != 'true'
run: |
cd installer/windows
mkdir redist
Expand Down
2 changes: 2 additions & 0 deletions installer/windows/installer.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

<Chain>
<!-- VS2015 Redistributable. -->
<!-- Use SuppressSignatureVerification=no instead of hashing, since the VC redist URL is frequently updated by Microsoft. -->
<ExePackage Id="vcredist"
DisplayName="$(var.VCRedistName)"
Cache="no"
Expand All @@ -31,6 +32,7 @@
SourceFile="$(var.VCRedistFile)"
DownloadUrl="$(var.VCRedistURL)"
InstallCommand="/quiet /norestart"
SuppressSignatureVerification="no"
DetectCondition="vcredist AND (vcredist &gt;= &quot;14.26.28720&quot;)">
</ExePackage>

Expand Down

0 comments on commit 43ec269

Please sign in to comment.