mirror of
https://github.com/servo/servo
synced 2026-04-25 17:15:48 +02:00
ci: Update WiX files and Windows workflow to reflect ServoShell name (#43104)
`candle` generates the object file based on the name of WiX source file, which is used by linker later. This PR effectively changes: - `Servo.exe` to `ServoShell.exe` for the windows installer - `Servo.zip` to `ServoShell.zip` We already generates `servoshell.exe` from build, it is weird that we keep the name `Servo.exe` for the MSI. Testing: The problem is fixed, for both executable and zip, see [this](https://github.com/servo/servo/actions/runs/22841763218/job/66249263625). Bencher [works too](https://github.com/servo/servo/actions/runs/22843667165/job/66256020144). Fixes: #43102, where the windows artifact keeps missing. --------- Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
10
.github/workflows/windows.yml
vendored
10
.github/workflows/windows.yml
vendored
@@ -197,21 +197,21 @@ jobs:
|
||||
run: .\mach package --profile ${{ inputs.profile }}
|
||||
# These files are available
|
||||
# MSI Installer: C:\a\servo\servo\target\${{ inputs.profile }}\msi\Installer.msi
|
||||
# Bundle: C:\a\servo\servo\target\${{ inputs.profile }}\msi\servoshell.exe
|
||||
# Zip: C:\a\servo\servo\target\${{ inputs.profile }}\msi\Servo.zip
|
||||
# Bundle: C:\a\servo\servo\target\${{ inputs.profile }}\msi\ServoShell.exe
|
||||
# Zip: C:\a\servo\servo\target\${{ inputs.profile }}\msi\ServoShell.zip
|
||||
- name: Upload artifact for mach package
|
||||
uses: actions/upload-artifact@v6
|
||||
id: upload-exe
|
||||
with:
|
||||
name: ${{ inputs.profile }}-binary-windows
|
||||
path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\servoshell.exe
|
||||
path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\ServoShell.exe
|
||||
- name: Upload artifact for mach package (zip)
|
||||
uses: actions/upload-artifact@v6
|
||||
id: upload-zip
|
||||
if: ${{ inputs.upload_zip }}
|
||||
with:
|
||||
name: ${{ inputs.profile }}-binary-windows-zip
|
||||
path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\Servo.zip
|
||||
path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\ServoShell.zip
|
||||
- name: Collect artifact IDs needed by the release workflow
|
||||
id: artifact_ids
|
||||
shell: bash
|
||||
@@ -230,7 +230,7 @@ jobs:
|
||||
target: 'windows'
|
||||
profile: ${{ inputs.profile }}
|
||||
compressed-file-path: ''
|
||||
binary-path: ${{ inputs.profile }}-binary-windows/servoshell.exe
|
||||
binary-path: ${{ inputs.profile }}-binary-windows/ServoShell.exe
|
||||
file-size: true
|
||||
speedometer: false
|
||||
dromaeo: false
|
||||
|
||||
Reference in New Issue
Block a user