Skip to content

Commit

Permalink
Merge pull request #1317 from hallieswan/AG-1330
Browse files Browse the repository at this point in the history
AG-1330: combine workflows into one workflow with multiple jobs
  • Loading branch information
hallieswan authored Jun 18, 2024
2 parents e90d0eb + 7059525 commit e882d81
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 57 deletions.
18 changes: 16 additions & 2 deletions .github/workflows/e2e.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
name: Build Data Image and Run End-to-end Tests
name: Build and run unit tests, build data image and run e2e tests

on: push

jobs:
build-and-run-unit-tests:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
- run: npm ci
- run: APP_ENV=develop npm run ci:build:develop
- run: npm test

check-for-image:
# Run in Sage repo on develop or main branches
# and on all branches in user-owned forks
Expand Down Expand Up @@ -184,9 +197,10 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'

- name: install dependencies
run: npm install
run: npm ci

- name: install Playwright Browsers
run: npx playwright install --with-deps
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/node.js.yml

This file was deleted.

0 comments on commit e882d81

Please sign in to comment.