From bf288771c4499b7d8b2c71d0d9c8804bb8576238 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Wed, 28 Apr 2021 11:51:33 +1000 Subject: [PATCH 1/5] Set name and description --- web-chat/public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-chat/public/index.html b/web-chat/public/index.html index 59e7d9cae6..a620c9fec6 100644 --- a/web-chat/public/index.html +++ b/web-chat/public/index.html @@ -7,7 +7,7 @@ - React App + Waku v2 chat app From b109fa4407804ec97ec956a331bcf7fd79728c52 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Wed, 28 Apr 2021 11:52:26 +1000 Subject: [PATCH 2/5] Remove useless script npm i must be run first to have `run-s` available. --- web-chat/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web-chat/package.json b/web-chat/package.json index 7a0e1966f7..6e8c585afc 100644 --- a/web-chat/package.json +++ b/web-chat/package.json @@ -33,9 +33,8 @@ "test:spelling": "cspell \"{README.md,.github/*.md,src/**/*.{ts,tsx},public/**/*.html}\"", "fix:prettier": "prettier \"src/**/*.{ts,tsx}\" --write", "fix:lint": "eslint src --ext .ts --ext .tsx --fix", - "js-waku:install": "cd ../; npm install", "js-waku:build": "cd ../; npm run build", - "predeploy": "run-s js-waku:* build", + "predeploy": "run-s js-waku:build build", "deploy": "gh-pages -d build" }, "eslintConfig": { From cda14ee5050a57e63353ed05cc68ae093a22bc27 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Wed, 28 Apr 2021 11:59:59 +1000 Subject: [PATCH 3/5] Relative URL is enough for the homepage --- web-chat/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-chat/package.json b/web-chat/package.json index 6e8c585afc..11910836d1 100644 --- a/web-chat/package.json +++ b/web-chat/package.json @@ -2,7 +2,7 @@ "name": "web-chat", "version": "0.1.0", "private": true, - "homepage": "https://status-im.github.io/js-waku", + "homepage": "/js-waku", "dependencies": { "@material-ui/core": "^4.11.3", "@testing-library/jest-dom": "^5.11.10", From 32672b9d53f2b6d65293f95813625a5ad779a4df Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Wed, 28 Apr 2021 12:03:39 +1000 Subject: [PATCH 4/5] Use GitHub Action to deploy to gh pages --- .github/workflows/deploy-gh-pages.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index 245458c0cb..ca6483d802 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -40,5 +40,7 @@ jobs: working-directory: web-chat - name: Deploy web chat app on gh pages - run: npm run deploy - working-directory: web-chat + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./web-chat/build From f78145c7aa834175d9b3313e0795eca7d81b70d7 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Wed, 28 Apr 2021 12:04:40 +1000 Subject: [PATCH 5/5] Build the web app --- .github/workflows/deploy-gh-pages.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index ca6483d802..df78baa4ac 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -39,6 +39,10 @@ jobs: run: npm install working-directory: web-chat + - name: build web app + run: npm run build + working-directory: web-chat + - name: Deploy web chat app on gh pages uses: peaceiris/actions-gh-pages@v3 with: