From 9696ee890b00e64ecfa7320cb93b8e0ad9f69937 Mon Sep 17 00:00:00 2001 From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com> Date: Wed, 29 Apr 2026 18:57:55 -0400 Subject: [PATCH] Consolidate CI workflows: fold ci.yml's test step into build.yml Two workflows ("Build" and "CI") were both running on PR push to dev with identically-named "build" jobs, doubling restore+compile work and showing as duplicate "build" rows in `gh pr checks`. Move the Lite.Tests build + dotnet test step into build.yml's existing job and delete ci.yml. Also extend build.yml's push trigger to include dev so post-merge runs still happen. Verified locally: dotnet test Lite.Tests/Lite.Tests.csproj -c Release passes 257/257. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/build.yml | 9 ++++++++- .github/workflows/ci.yml | 36 ------------------------------------ 2 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2e88c68..dbc00973 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: [main] + branches: [main, dev] pull_request: branches: [main, dev] release: @@ -30,6 +30,13 @@ jobs: dotnet restore Dashboard/Dashboard.csproj dotnet restore Lite/PerformanceMonitorLite.csproj dotnet restore Installer/PerformanceMonitorInstaller.csproj + dotnet restore Lite.Tests/Lite.Tests.csproj + + - name: Build Lite.Tests + run: dotnet build Lite.Tests/Lite.Tests.csproj -c Release --no-restore + + - name: Run Lite tests + run: dotnet test Lite.Tests/Lite.Tests.csproj -c Release --no-build --verbosity normal - name: Get version id: version diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index cc844581..00000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: CI - -on: - push: - branches: [dev] - pull_request: - branches: [dev] - -jobs: - build: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v4 - - - name: Setup .NET 8.0 - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.0.x - - - name: Restore dependencies - run: | - dotnet restore Dashboard/Dashboard.csproj - dotnet restore Lite/PerformanceMonitorLite.csproj - dotnet restore Installer/PerformanceMonitorInstaller.csproj - dotnet restore Lite.Tests/Lite.Tests.csproj - - - name: Build all projects - run: | - dotnet build Dashboard/Dashboard.csproj -c Release --no-restore - dotnet build Lite/PerformanceMonitorLite.csproj -c Release --no-restore - dotnet build Installer/PerformanceMonitorInstaller.csproj -c Release --no-restore - dotnet build Lite.Tests/Lite.Tests.csproj -c Release --no-restore - - - name: Run tests - run: dotnet test Lite.Tests/Lite.Tests.csproj -c Release --no-build --verbosity normal