Skip to content

Commit 4a49097

Browse files
committed
Fix workflow: split Windows soak into own job (matrix.shell not supported)
1 parent aa25f73 commit 4a49097

File tree

2 files changed

+59
-33
lines changed

2 files changed

+59
-33
lines changed

.github/workflows/dry-run.yml

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ jobs:
512512
# ── Step 6: Soak tests (after smoke, per-platform) ──────────
513513
soak-quick:
514514
if: ${{ inputs.soak_level != 'none' && !inputs.skip_builds }}
515-
needs: [smoke-unix]
515+
needs: [build-unix]
516516
runs-on: ${{ matrix.os }}
517517
timeout-minutes: 30
518518
strategy:
@@ -534,18 +534,36 @@ jobs:
534534
goarch: arm64
535535
cc: cc
536536
cxx: c++
537-
shell: bash
538-
- os: windows-latest
539-
goos: windows
540-
goarch: amd64
541-
cc: clang
542-
cxx: clang++
543-
shell: msys2 {0}
537+
steps:
538+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
539+
540+
- name: Install deps (Linux)
541+
if: startsWith(matrix.os, 'ubuntu')
542+
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev python3 git
543+
544+
- name: Build (release mode)
545+
run: scripts/build.sh CC=${{ matrix.cc }} CXX=${{ matrix.cxx }}
546+
547+
- name: Quick soak (10 min)
548+
run: scripts/soak-test.sh build/c/codebase-memory-mcp 10
549+
550+
- name: Upload soak metrics
551+
if: always()
552+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
553+
with:
554+
name: soak-quick-${{ matrix.goos }}-${{ matrix.goarch }}
555+
path: soak-results/
556+
retention-days: 14
557+
558+
soak-quick-windows:
559+
if: ${{ inputs.soak_level != 'none' && !inputs.skip_builds }}
560+
needs: [build-windows]
561+
runs-on: windows-latest
562+
timeout-minutes: 30
544563
steps:
545564
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
546565

547566
- uses: msys2/setup-msys2@4f806de0a5a7294ffabaff804b38a9b435a73bda # v2
548-
if: matrix.goos == 'windows'
549567
with:
550568
msystem: CLANG64
551569
path-type: inherit
@@ -554,16 +572,12 @@ jobs:
554572
git
555573
coreutils
556574
557-
- name: Install deps (Linux)
558-
if: startsWith(matrix.os, 'ubuntu')
559-
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev python3 git
560-
561575
- name: Build (release mode)
562-
shell: ${{ matrix.shell || 'bash' }}
563-
run: scripts/build.sh CC=${{ matrix.cc }} CXX=${{ matrix.cxx }}
576+
shell: msys2 {0}
577+
run: scripts/build.sh CC=clang CXX=clang++
564578

565579
- name: Quick soak (10 min)
566-
shell: ${{ matrix.shell || 'bash' }}
580+
shell: msys2 {0}
567581
run: |
568582
BIN=build/c/codebase-memory-mcp
569583
[ -f "${BIN}.exe" ] && BIN="${BIN}.exe"
@@ -573,7 +587,7 @@ jobs:
573587
if: always()
574588
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
575589
with:
576-
name: soak-quick-${{ matrix.goos }}-${{ matrix.goarch }}
590+
name: soak-quick-windows-amd64
577591
path: soak-results/
578592
retention-days: 14
579593

.github/workflows/release.yml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -535,32 +535,44 @@ jobs:
535535
goarch: arm64
536536
cc: cc
537537
cxx: c++
538-
shell: bash
539-
- os: windows-latest
540-
goos: windows
541-
goarch: amd64
542-
cc: clang
543-
cxx: clang++
544-
shell: msys2 {0}
538+
steps:
539+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
540+
- name: Install deps (Linux)
541+
if: startsWith(matrix.os, 'ubuntu')
542+
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev python3 git
543+
- name: Build (release mode)
544+
run: scripts/build.sh --version ${{ inputs.version }} CC=${{ matrix.cc }} CXX=${{ matrix.cxx }}
545+
- name: Quick soak (10 min)
546+
run: scripts/soak-test.sh build/c/codebase-memory-mcp 10
547+
- name: Upload soak metrics
548+
if: always()
549+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
550+
with:
551+
name: soak-quick-${{ matrix.goos }}-${{ matrix.goarch }}
552+
path: soak-results/
553+
retention-days: 14
554+
555+
# ── Step 5a-win: Quick soak (Windows, separate job) ─────────────
556+
soak-quick-windows:
557+
if: ${{ inputs.soak_level != 'none' }}
558+
needs: [build-windows]
559+
runs-on: windows-latest
560+
timeout-minutes: 30
545561
steps:
546562
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
547563
- uses: msys2/setup-msys2@4f806de0a5a7294ffabaff804b38a9b435a73bda # v2
548-
if: matrix.goos == 'windows'
549564
with:
550565
msystem: CLANG64
551566
path-type: inherit
552567
install: >-
553568
mingw-w64-clang-x86_64-python3
554569
git
555570
coreutils
556-
- name: Install deps (Linux)
557-
if: startsWith(matrix.os, 'ubuntu')
558-
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev python3 git
559571
- name: Build (release mode)
560-
shell: ${{ matrix.shell || 'bash' }}
561-
run: scripts/build.sh --version ${{ inputs.version }} CC=${{ matrix.cc }} CXX=${{ matrix.cxx }}
572+
shell: msys2 {0}
573+
run: scripts/build.sh --version ${{ inputs.version }} CC=clang CXX=clang++
562574
- name: Quick soak (10 min)
563-
shell: ${{ matrix.shell || 'bash' }}
575+
shell: msys2 {0}
564576
run: |
565577
BIN=build/c/codebase-memory-mcp
566578
[ -f "${BIN}.exe" ] && BIN="${BIN}.exe"
@@ -569,7 +581,7 @@ jobs:
569581
if: always()
570582
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
571583
with:
572-
name: soak-quick-${{ matrix.goos }}-${{ matrix.goarch }}
584+
name: soak-quick-windows-amd64
573585
path: soak-results/
574586
retention-days: 14
575587

@@ -609,7 +621,7 @@ jobs:
609621

610622
# ── Step 6: Create DRAFT release (not public yet) ─────────────
611623
release-draft:
612-
needs: [smoke-unix, smoke-windows, security-static, codeql-gate, soak-quick]
624+
needs: [smoke-unix, smoke-windows, security-static, codeql-gate, soak-quick, soak-quick-windows]
613625
if: ${{ !cancelled() && !failure() }}
614626
runs-on: ubuntu-latest
615627
permissions:

0 commit comments

Comments
 (0)