Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use single package.json #3630

Merged
merged 2 commits into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
${{ runner.os }}-node-

- name: Install npm dependencies
run: npm ci --prefix assets
run: npm ci

- name: Build assets
run: mix assets.build
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,16 @@ jobs:
${{ runner.os }}-node-

- name: npm install and test
run: npm run js:test
run: npm run setup && npm run js:test

- name: eslint
run: cd assets && npx eslint
run: npx eslint

- uses: actions/upload-artifact@v4
if: always()
with:
name: js-unit-coverage
path: assets/coverage/
path: coverage/
retention-days: 7

e2e_test:
Expand All @@ -161,7 +161,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.47.1-jammy
image: mcr.microsoft.com/playwright:v1.49.1-jammy
env:
ImageOS: ubuntu22
HOME: /root
Expand Down Expand Up @@ -205,9 +205,6 @@ jobs:
- name: Run e2e tests
run: npm run e2e:test

- name: eslint
run: npx eslint

- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down Expand Up @@ -275,7 +272,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: js-unit-coverage
path: assets/coverage/
path: coverage/

- name: Download e2e-test-results artifact
uses: actions/download-artifact@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ node_modules

/test/e2e/test-results/
/playwright-report/
/coverage/
12 changes: 2 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,19 +193,11 @@ $ npm run test

Running the JavaScript unit tests:

```bash
$ cd assets
$ npm install
$ npm run test
# to automatically run tests for files that have been changed
$ npm run test.watch
```

or simply:

```bash
$ npm run setup
$ npm run js:test
# to automatically run tests for files that have been changed
$ npm run js:test.watch
```

Running the JavaScript end-to-end tests:
Expand Down
1 change: 0 additions & 1 deletion assets/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions assets/eslint.config.mjs

This file was deleted.

Loading
Loading