Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
holgergp committed Apr 4, 2024
2 parents fd7d940 + 612901c commit 2e21805
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
persist-credentials: false

- name: Setup project
run: yarn install --frozen-lockfile
run: npm ci

- name: Test project
run: yarn run check
run: npm run check

- name: Cypress Tests
uses: cypress-io/github-action@v2
with:
start: yarn start
start: npm run start
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11 changes: 5 additions & 6 deletions .github/workflows/ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
node-version: [16.x]
steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
Expand All @@ -23,15 +23,14 @@ jobs:
persist-credentials: false

- name: Setup project
run: yarn install --frozen-lockfile
- name: Check project
run: yarn run check
run: npm ci

- name: Build project
run: yarn run build --if-present
run: npm run build

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: build # The folder the action should deploy.
FOLDER: build # The folder the action should deploy.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

Rewrite of the [halbton](https://github.com/holgergp/halbton) app in react.

See it live [here](https://holgergp.github.io/halbtonReact/)
See it live [here](https://halbton.netlify.app/)

Refer to the [docs](https://reactjs.org/docs/create-a-new-react-app.html#create-react-app) of Create React App for instructions to set it up locally.
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
"name": "halbton-react",
"version": "0.1.0",
"private": true,
"homepage": "https://holgergp.github.io/halbtonReact",
"homepage": "https://halbton.netlify.app/",
"dependencies": {
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/user-event": "^13.1.9",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^13.1.9",
"@types/jest": "^26.0.23",
"@types/node": "^15.12.4",
"@types/node": "^18.14.6",
"@types/react": "^17.0.11",
"@types/react-dom": "^17.0.8",
"cypress": "^7.5.0",
"node-sass": "^5.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hotkeys-hook": "^3.3.2",
"react-scripts": "4.0.3",
"sass": "^1.53.0",
"sass-loader": "^13.0.2",
"typescript": "^4.3.4",
"yarn-run-all": "^3.1.1"
},
Expand Down

0 comments on commit 2e21805

Please sign in to comment.