Skip to content

Commit

Permalink
Merge branch 'master' into 61-stylize-ui-2
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanR712 authored Oct 17, 2023
2 parents 5c7760d + eb18e43 commit 8f4244f
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 20 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/buildAndDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ on:

jobs:
build:
timeout-minutes: 5
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: Documentation Generation
run: npm run build-docs
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/buildElectronArtifcact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ on:

jobs:
build:
timeout-minutes: 5
runs-on: windows-latest

steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: Vite build
run: npm run build-electron
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ on:

jobs:
lint:
timeout-minutes: 5
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: Lint TS Code according to gts
run: npm run lint
3 changes: 2 additions & 1 deletion .github/workflows/runTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ on:

jobs:
test:
timeout-minutes: 5
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

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

- name: Run all vitest tests
run: npm run test
6 changes: 4 additions & 2 deletions .github/workflows/validateBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,27 @@ on:

jobs:
build-Ubuntu:
timeout-minutes: 5
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: use Vite to compile the application
run: npm run build

build-Windows:
timeout-minutes: 5
runs-on: windows-latest

steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: use Vite to compile the application
run: npm run build
6 changes: 4 additions & 2 deletions .github/workflows/validateBuildElectron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,26 @@ on:

jobs:
build-Electron-Ubuntu:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: use Vite to compile the application
run: npm run build-electron

build-Electron-Windows:
timeout-minutes: 5
runs-on: windows-latest

steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: use Vite to compile the application
run: npm run build-electron
3 changes: 2 additions & 1 deletion .github/workflows/validateDocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ on:

jobs:
buildDocs:
timeout-minutes: 5
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Install NPM deps
run: npm install
run: npm ci

- name: Build Docs
run: npm run build-docs
1 change: 1 addition & 0 deletions .github/workflows/validateHTML.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
validateHTML:
timeout-minutes: 5
runs-on: ubuntu-latest

steps:
Expand Down
27 changes: 18 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
},
"homepage": "https://github.com/James-Oswald/PeirceMyHeart#readme",
"devDependencies": {
"@types/node": "20.8.3",
"@types/node": "20.8.6",
"@types/wicg-file-system-access": "^2023.10.1",
"electron": "^26.2.1",
"electron": "^27.0.0",
"electron-packager": "^17.1.2",
"gts": "^5.2.0",
"typedoc": "^0.25.2",
Expand Down

0 comments on commit 8f4244f

Please sign in to comment.