Skip to content

Commit 666b1e1

Browse files
Eliminate sloppy powershell scripts
1 parent fcea94d commit 666b1e1

File tree

6 files changed

+18
-89
lines changed

6 files changed

+18
-89
lines changed

.github/workflows/CI-native.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,14 @@ jobs:
6565
id: native_ci
6666
shell: powershell
6767
run: |
68-
.\Build\Agent\Run-NativeCi.ps1 -Configuration Debug -Platform x64
68+
.\build.ps1 -Configuration Debug -Platform x64 -Project Build/Src/NativeBuild/NativeBuild.csproj
69+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
70+
71+
- name: Build and run native tests
72+
id: native_test
73+
shell: powershell
74+
run: |
75+
.\test.ps1 -Configuration Debug -Native
6976
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
7077
7178
- name: Summarize native test results

.github/workflows/CI.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,18 @@ jobs:
2323
uses: actions/checkout@v4
2424
id: checkout
2525

26-
- name: Run managed CI pipeline
27-
id: managed_ci
26+
- name: Build managed (with tests)
27+
id: managed_build
2828
shell: powershell
2929
run: |
30-
.\Build\Agent\Run-ManagedCi.ps1 -Configuration Debug -Platform x64
30+
.\build.ps1 -Configuration Debug -Platform x64 -BuildTests
31+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
32+
33+
- name: Run managed tests
34+
id: managed_test
35+
shell: powershell
36+
run: |
37+
.\test.ps1 -Configuration Debug -NoBuild -TestFilter 'TestCategory!=LongRunning&TestCategory!=ByHand&TestCategory!=SmokeTest&TestCategory!=DesktopRequired'
3138
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
3239
3340
- name: Upload TRX test results

Build/Agent/Build-NativeTestExecutables.ps1

Lines changed: 0 additions & 24 deletions
This file was deleted.

Build/Agent/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ PowerShell scripts for build, test, and CI orchestration.
1111

1212
| Script | Purpose |
1313
|--------|---------|
14-
| `Run-ManagedCi.ps1` | Orchestrates managed CI path: build (`build.ps1 -BuildTests`) then filtered managed tests (`test.ps1 -NoBuild`). |
15-
| `Run-NativeCi.ps1` | Orchestrates native CI path: build (`build.ps1 -BuildTests`), build native test exes, then run native tests (`test.ps1 -Native -NoBuild`). |
16-
| `Build-NativeTestExecutables.ps1` | Builds native test executables (`TestGeneric`, `TestViews`) via `Build/scripts/Invoke-CppTest.ps1`. |
1714
| `Summarize-NativeTestResults.ps1` | Parses native Unit++ logs and appends a pass/fail summary table to GitHub step summary. |
1815

1916
## GitHub Actions usage

Build/Agent/Run-ManagedCi.ps1

Lines changed: 0 additions & 27 deletions
This file was deleted.

Build/Agent/Run-NativeCi.ps1

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)