From ec90bd021a127deeb5e6e034e7d4ef6f2387c9b5 Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@status.im>
Date: Fri, 18 Jun 2021 16:51:11 +1000
Subject: [PATCH] Deploy main HEAD eth-dm to GH pages

---
 .github/workflows/deploy-gh-pages-eth-dm.yml | 51 --------------------
 .github/workflows/deploy-gh-pages.yml        | 21 ++++++--
 2 files changed, 18 insertions(+), 54 deletions(-)
 delete mode 100644 .github/workflows/deploy-gh-pages-eth-dm.yml

diff --git a/.github/workflows/deploy-gh-pages-eth-dm.yml b/.github/workflows/deploy-gh-pages-eth-dm.yml
deleted file mode 100644
index b87d98f6a9..0000000000
--- a/.github/workflows/deploy-gh-pages-eth-dm.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Eth DM Deploy GH Pages
-
-on:
-  push:
-    branches:
-      - '72-eth-dm'
-
-jobs:
-  deploy_gh_pages:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set git author identity
-        run: |
-          git config user.name "GitHub Action On js-waku Repo"
-          git config user.email "franck+ghpages@status.im"
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-
-      - name: Cache npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: node-v1-${{ hashFiles('**/package-lock.json') }}
-
-      - name: "[js-waku] install using npm ci"
-        uses: bahmutov/npm-install@v1
-
-      - name: "[js-waku] build"
-        run: npm run build
-
-      - name: install eth dm using npm i
-        run: npm install
-        working-directory: examples/eth-dm
-
-      - name: build eth dm
-        run: npm run build
-        working-directory: examples/eth-dm
-
-      - name: Deploy eth dm app on gh pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./examples/eth-dm/build
-          destination_dir: eth-dm
diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml
index 050a87edb6..5275c0f9ad 100644
--- a/.github/workflows/deploy-gh-pages.yml
+++ b/.github/workflows/deploy-gh-pages.yml
@@ -35,20 +35,35 @@ jobs:
       - name: "[js-waku] build"
         run: npm run build
 
-      - name: install using npm i
+      - name: "[web-chat] install using npm i"
         run: npm install
         working-directory: examples/web-chat
 
-      - name: build web app
+      - name: "[web-chat] build"
         run: npm run build
         working-directory: examples/web-chat
 
-      - name: Deploy web chat app on gh pages
+      - name: "[web-chat] Deploy on gh pages to /"
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./examples/web-chat/build
 
+      - name: "[eth-dm] install using npm i"
+        run: npm install
+        working-directory: examples/eth-dm
+
+      - name: "[eth-dm] build"
+        run: npm run build
+        working-directory: examples/eth-dm
+
+      - name: "[eth-dm] Deploy on gh pages to /eth-dm"
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./examples/eth-dm/build
+          destination_dir: eth-dm
+
       - name: Generate docs
         run: npm run doc:html