Skip to content

Commit

Permalink
Merge branch 'master' of github.com:DanTheMan827/ntag215-puck.js
Browse files Browse the repository at this point in the history
  • Loading branch information
DanTheMan827 committed Jan 19, 2025
2 parents 36916ed + 4b78de7 commit 5f6865c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: 16.x
uses: actions/setup-node@v4

- name: Build web app
run: |
Expand All @@ -38,7 +36,7 @@ jobs:
npm run build
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: ./puck-ntag215-manager/dist/

Expand All @@ -53,4 +51,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
10 changes: 6 additions & 4 deletions .github/workflows/nodejs-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
name: Node.js Build Test

on:
push:
branches:
- "*"

pull_request:
workflow_dispatch:

Expand All @@ -12,12 +16,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: 16.x
uses: actions/setup-node@v4

- name: Build web app
run: |
Expand Down

0 comments on commit 5f6865c

Please sign in to comment.