Skip to content

Commit 8382afc

Browse files
Fix #1273: keep CI fast and restore submodules
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 25c7509 commit 8382afc

6 files changed

Lines changed: 32 additions & 6 deletions

File tree

.github/workflows/ci-full.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@ jobs:
2121
windows-full:
2222
name: Windows build + integration tests (windows-latest)
2323
runs-on: windows-latest
24+
timeout-minutes: 120
2425
env:
2526
AVALONIA_UI_LICENSE_KEY: ${{ secrets.AVALONIA_UI_LICENSE_KEY }}
2627
steps:
2728
- name: Checkout
2829
uses: actions/checkout@v4
30+
with:
31+
submodules: recursive
32+
fetch-depth: 0
2933

3034
- name: Set up build
3135
uses: ./.github/actions/setup-build
@@ -53,11 +57,15 @@ jobs:
5357
linux-data-layer:
5458
name: Linux Docker/data-layer tests (ubuntu-latest)
5559
runs-on: ubuntu-latest
60+
timeout-minutes: 120
5661
env:
5762
AVALONIA_UI_LICENSE_KEY: ${{ secrets.AVALONIA_UI_LICENSE_KEY }}
5863
steps:
5964
- name: Checkout
6065
uses: actions/checkout@v4
66+
with:
67+
submodules: recursive
68+
fetch-depth: 0
6169

6270
- name: Set up build
6371
uses: ./.github/actions/setup-build

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@ jobs:
1616
build-and-test:
1717
name: Build and fast tests (windows-latest)
1818
runs-on: windows-latest
19+
timeout-minutes: 10
1920
env:
2021
AVALONIA_UI_LICENSE_KEY: ${{ secrets.AVALONIA_UI_LICENSE_KEY }}
2122
steps:
2223
- name: Checkout
2324
uses: actions/checkout@v4
25+
with:
26+
submodules: recursive
27+
fetch-depth: 0
2428

2529
- name: Set up build
2630
uses: ./.github/actions/setup-build
@@ -31,7 +35,9 @@ jobs:
3135

3236
- name: Run fast test suite
3337
shell: pwsh
34-
run: .\scripts\run-tests.ps1 -Mode fast
38+
run: |
39+
Write-Host 'Fast filter: Category!=SlowDocker & Category!=SlowGit & Category!=Integration & Category!=WebView & Category!=SlowLayout'
40+
.\scripts\run-tests.ps1 -Mode fast
3541
3642
- name: Upload test results log
3743
if: always()

.github/workflows/publish-validation.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ jobs:
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v4
24+
with:
25+
submodules: recursive
26+
fetch-depth: 0
2427

2528
- name: Set up build
2629
uses: ./.github/actions/setup-build

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
uses: actions/checkout@v4
3434
with:
3535
ref: ${{ github.event.inputs.tag || github.ref }}
36+
submodules: recursive
37+
fetch-depth: 0
3638

3739
- name: Set up build
3840
uses: ./.github/actions/setup-build

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Single source of truth for the product version, consumed by the assembly version,
44
the app.manifest identity (kept in sync), and the release tag. -->
55
<PropertyGroup>
6-
<Version>0.1.0</Version>
6+
<Version>0.0.1</Version>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
</PropertyGroup>
99
</Project>

scripts/run-tests.ps1

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,28 @@ if ($TestNames -and $TestNames.Count -gt 0)
7373

7474
if ($Mode -eq 'fast')
7575
{
76-
$filterClauses += '(Category!=SlowGit)'
77-
$filterClauses += '(Category!=SlowDocker)'
76+
if (-not $TestNames -or $TestNames.Count -eq 0)
77+
{
78+
$filterClauses += 'Category!=SlowDocker & Category!=SlowGit & Category!=Integration & Category!=WebView & Category!=SlowLayout'
79+
}
80+
else
81+
{
82+
$filterClauses += '(Category!=SlowGit)'
83+
$filterClauses += '(Category!=SlowDocker)'
84+
}
7885
}
7986

8087
# WebView integration tests require a real desktop browser host (native WebView2) and are
8188
# excluded by default. Run them with -IncludeWebView (or by targeting them with -TestNames)
8289
# whenever you touch WebView/browser-hosted rendering code.
83-
if (-not $IncludeWebView -and (-not $TestNames -or $TestNames.Count -eq 0))
90+
if ($Mode -ne 'fast' -and -not $IncludeWebView -and (-not $TestNames -or $TestNames.Count -eq 0))
8491
{
8592
$filterClauses += '(Category!=WebView)'
8693
}
8794

8895
# Integration tests require network access, a valid GitHub token with tunnel scope
8996
# (PHANTOM_INTEGRATION_GITHUB_TOKEN), and may incur dev-tunnel relay costs. Excluded by default.
90-
if (-not $IncludeIntegration -and (-not $TestNames -or $TestNames.Count -eq 0))
97+
if ($Mode -ne 'fast' -and -not $IncludeIntegration -and (-not $TestNames -or $TestNames.Count -eq 0))
9198
{
9299
$filterClauses += '(Category!=Integration)'
93100
}

0 commit comments

Comments
 (0)