mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
use newer wix in CI (#30378)
* Install wixtoolset via chocolatey * choco install wixtoolset in CI * Update windows.yml
This commit is contained in:
parent
4804bab118
commit
df8cd1a7c8
2 changed files with 5 additions and 6 deletions
10
.github/workflows/windows.yml
vendored
10
.github/workflows/windows.yml
vendored
|
@ -53,14 +53,12 @@ jobs:
|
||||||
with:
|
with:
|
||||||
ref: refs/pull/${{ github.event.issue.number }}/head
|
ref: refs/pull/${{ github.event.issue.number }}/head
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
- name: wix311-binaries
|
|
||||||
shell: powershell
|
|
||||||
run: |
|
|
||||||
Start-BitsTransfer -Source https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip -Destination C:\\wix311-binaries.zip
|
|
||||||
Expand-Archive C:\\wix311-binaries.zip -DestinationPath C:\\wix
|
|
||||||
echo "C:\\wix" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
|
||||||
- name: ccache
|
- name: ccache
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
- name: Install wixtoolset
|
||||||
|
run: |
|
||||||
|
choco install wixtoolset
|
||||||
|
echo "C:\\Program Files (x86)\\WiX Toolset v3.11\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
||||||
- name: Bootstrap
|
- name: Bootstrap
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip virtualenv
|
python -m pip install --upgrade pip virtualenv
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
<package id="cmake" version="3.26.4" installArguments="ADD_CMAKE_TO_PATH=System"/>
|
<package id="cmake" version="3.26.4" installArguments="ADD_CMAKE_TO_PATH=System"/>
|
||||||
<package id="git"/>
|
<package id="git"/>
|
||||||
<package id="llvm"/>
|
<package id="llvm"/>
|
||||||
|
<package id="wixtoolset" version="3.11.2"/>
|
||||||
<package id="ninja"/>
|
<package id="ninja"/>
|
||||||
<package id="python"/>
|
<package id="python"/>
|
||||||
<package id="python3-virtualenv"/>
|
<package id="python3-virtualenv"/>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue