From 7d59d09d69a843f32c2666ee650a5217b520ba9b Mon Sep 17 00:00:00 2001
From: Mike Bender <mikebender@deephaven.io>
Date: Mon, 13 May 2024 14:59:56 -0400
Subject: [PATCH] ci: Enable tests on feature branches (#2007)

- We were not running tests on feature branches
---
 .github/workflows/e2e.yml  | 9 ++++-----
 .github/workflows/unit.yml | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 23ae11172..2bb0f51ef 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -7,15 +7,16 @@ on:
     branches:
       - main
       - 'release/**'
+      - 'feature/**'
   pull_request:
     branches:
       - main
       - 'release/**'
+      - 'feature/**'
 env:
   DOCKER_TAG: edge
 
 jobs:
-
   build:
     runs-on: ubuntu-22.04
     concurrency:
@@ -81,7 +82,6 @@ jobs:
         run: |
           docker pull --quiet ghcr.io/deephaven/server:${{ env.DOCKER_TAG }}
           docker run --detach --publish 10000:10000 --name dh-core-server -v ./tests/docker-scripts/data:/data --env "START_OPTS=-Xmx4g -DAuthHandlers=io.deephaven.auth.AnonymousAuthenticationHandler -Ddeephaven.application.dir=./data/app.d" ghcr.io/deephaven/server:${{ env.DOCKER_TAG }}
-    
 
       - name: Cache node modules
         id: cache-node-modules
@@ -112,8 +112,7 @@ jobs:
           echo "shardTotal=${MATRIX_CONFIG: -1:1}" >> $GITHUB_OUTPUT
 
       - name: Run Playwright tests
-        run: 
-          PLAYWRIGHT_BROWSERS_PATH=0 npx playwright test --config=playwright-ci.config.ts --reporter=blob --project=${{ steps.config.outputs.browser }} --shard=${{ steps.config.outputs.shard }}/${{ steps.config.outputs.shardTotal }}
+        run: PLAYWRIGHT_BROWSERS_PATH=0 npx playwright test --config=playwright-ci.config.ts --reporter=blob --project=${{ steps.config.outputs.browser }} --shard=${{ steps.config.outputs.shard }}/${{ steps.config.outputs.shardTotal }}
 
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
@@ -122,7 +121,7 @@ jobs:
           name: playwright-report-blob-${{ matrix.config }}
           path: blob-report/
           retention-days: 1
-          
+
       - name: Dump server logs
         if: failure()
         run: docker logs dh-core-server > /tmp/server-log.txt
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index ac94e0c0d..2952deb78 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -7,10 +7,12 @@ on:
     branches:
       - main
       - 'release/**'
+      - 'feature/**'
   pull_request:
     branches:
       - main
       - 'release/**'
+      - 'feature/**'
 jobs:
   unit:
     runs-on: ubuntu-22.04