From 7ed6f68ec7877dcb97eb600b517fe46b611b6fe4 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Fri, 23 Apr 2021 08:46:07 +1000 Subject: [PATCH 1/2] Install before deploy --- .github/workflows/deploy-gh-pages.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index 8d0fd32f4d..767e806123 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -24,6 +24,16 @@ jobs: 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 using npm i + run: npm install + working-directory: web-chat + - name: Deploy web chat app on gh pages run: npm run deploy working-directory: web-chat From d42355db1561f77a3829036eb9a52db496f9c6f6 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Fri, 23 Apr 2021 08:47:23 +1000 Subject: [PATCH 2/2] Add web CI to bors check list --- .github/workflows/deploy-gh-pages.yml | 2 +- .github/workflows/webchat-ci.yml | 2 +- bors.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index 767e806123..5760c16043 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -6,7 +6,7 @@ on: - 'main' jobs: - build_and_test: + deploy_gh_pages: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/webchat-ci.yml b/.github/workflows/webchat-ci.yml index 467230eb22..22eda8d492 100644 --- a/.github/workflows/webchat-ci.yml +++ b/.github/workflows/webchat-ci.yml @@ -9,7 +9,7 @@ on: pull_request: jobs: - build_and_test: + web_chat_build_and_test: runs-on: ubuntu-latest steps: diff --git a/bors.toml b/bors.toml index 94f2a4384a..77e74df7fc 100644 --- a/bors.toml +++ b/bors.toml @@ -1,3 +1,3 @@ -status = ["build_and_test"] +status = ["build_and_test", "web_chat_build_and_test"] block_labels = ["work-in-progress"] delete_merged_branches = true