mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Enable the GitHub merge queue (#29989)
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
9eee517132
commit
d5202a4a98
8 changed files with 59 additions and 56 deletions
15
.github/workflows/windows.yml
vendored
15
.github/workflows/windows.yml
vendored
|
@ -1,4 +1,4 @@
|
|||
name: Windows workflow
|
||||
name: Windows
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
|
@ -34,7 +34,7 @@ env:
|
|||
CARGO_TARGET_DIR: C:\\a\\servo\\servo\\target
|
||||
|
||||
jobs:
|
||||
build-win:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: windows-2019
|
||||
steps:
|
||||
|
@ -73,7 +73,7 @@ jobs:
|
|||
path: C:\\a\\servo\\servo\\target\\cargo-timings-*
|
||||
- name: Package
|
||||
run: python mach package --release
|
||||
- name: Upload Package
|
||||
- name: Upload package
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: win
|
||||
|
@ -82,7 +82,7 @@ jobs:
|
|||
# Bundle: C:\a\servo\servo\target\release\msi\Servo.exe
|
||||
# Zip: C:\a\servo\servo\target\release\msi\Servo.zip
|
||||
path: C:\\a\\servo\\servo\\target/release/msi/Servo.exe
|
||||
- name: Upload
|
||||
- name: Upload nightly
|
||||
if: ${{ inputs.upload }}
|
||||
run: |
|
||||
python mach upload-nightly windows-msvc --secret-from-environment `
|
||||
|
@ -92,13 +92,13 @@ jobs:
|
|||
NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
|
||||
NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
|
||||
|
||||
build_result:
|
||||
name: homu build finished
|
||||
result:
|
||||
name: Result
|
||||
runs-on: ubuntu-latest
|
||||
if: always()
|
||||
# needs all build to detect cancellation
|
||||
needs:
|
||||
- "build-win"
|
||||
- "build"
|
||||
|
||||
steps:
|
||||
- name: Mark the job as successful
|
||||
|
@ -107,3 +107,4 @@ jobs:
|
|||
- name: Mark the job as unsuccessful
|
||||
run: exit 1
|
||||
if: contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled')
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue