From 81bf9481a0f7c3bb159448d2fddc808067b09210 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 31 Aug 2023 20:58:19 -0700 Subject: [PATCH] spinoff feature-set copy ci test now also tests modular builds --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a26140af..d53ecbc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: python-version: '3.11' - name: Install dependencies run: tools/pcommand install_pip_reqs - - name: Assemble server build + - name: Assemble monolithic server build run: make cmake-server-build - name: Run tests run: BA_PCOMMANDBATCH_BUILD_REQUIRE=1 BA_APP_RUN_ENABLE_BUILDS=1 BA_APP_RUN_BUILD_HEADLESS=1 make test @@ -62,6 +62,7 @@ jobs: # Test spinoff feature-set copy functionality. # Make a copy of the template feature-set and build with it included. + # Also take the opportunity to test a modular build (we did monolithic above). feature_set_copy_test_linux: runs-on: ubuntu-22.04 steps: @@ -76,8 +77,8 @@ jobs: run: tools/spinoff fset-copy template_fs poo - name: Add new feature-set to project run: make update - - name: Assemble server build - run: make cmake-server-build + - name: Assemble modular server build + run: make cmake-modular-server-build # Most of our toolset doesn't work on raw Windows without WSL set up, # but we can bootstrap enough to run a few things manually. It's nice to