Skip to content

Commit

Permalink
Merge branch 'main' into routing/react-router
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/App.tsx
#	src/pages/global-info/GlobalInfo.tsx
  • Loading branch information
ValentinVignal committed Mar 12, 2024
2 parents 6caf697 + b7dc5c0 commit 942d270
Show file tree
Hide file tree
Showing 14 changed files with 2,185 additions and 16,199 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Test
on:
push:
branches:
- main
paths:
- 'src/**/*.{ts,tsx}'
- '.github/workflows/**'
- 'public/**'
pull_request:
branches:
- main
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm install --frozen-lockfile
- run: npm test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ yarn-debug.log*
yarn-error.log*

.env
.vscode/launch.json
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
}
}
Loading

0 comments on commit 942d270

Please sign in to comment.