Merge branch 'develop-2' into develop

inab · Feb 3, 2022 · 29d7684 · 29d7684
2 parents 5e49fee + 9d6dace
commit 29d7684
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,9 +4,13 @@ on:
   push:
     branches:
       - master
+      - develop
+      - develop-2
   pull_request:
     branches:
       - master
+      - develop
+      - develop-2
 
 jobs:
   ci:
@@ -48,34 +52,3 @@ jobs:
         run: npx codecov
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  gh-pages-deploy:
-    runs-on: ${{ matrix.os }}
-    needs: [ci]
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [16]
-
-    steps:
-      - name: Checkout 🛎
-        uses: actions/checkout@master
-
-      - name: Install dependencies 👨🏻‍💻
-        run: npm ci --prefer-offline --no-audit
-
-      - name: Github Pages Build
-        run: npm run generate:gh-pages
-        env:
-          REST_API_URL: ${{ secrets.REST_API_URL }}
-          SCIENTIFIC_SERVICE_URL: ${{ secrets.SCIENTIFIC_SERVICE_URL }}
-          OEB_LEGACY_ANGULAR_URI: ${{ secrets.OEB_LEGACY_ANGULAR_URI }}
-          VRE_URI: ${{ secrets.VRE_URI }}
-          OBSERVATORY_URI: ${{ secrets.OBSERVATORY_URI }}
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./dist
diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml
@@ -0,0 +1,40 @@
+name: GitHub Pages Deploy
+
+on:
+  push:
+    branches:
+      - develop-2
+  pull_request:
+    branches:
+      - develop-2
+
+jobs:
+  gh-pages-deploy:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [16]
+
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@master
+
+      - name: Install dependencies 👨🏻‍💻
+        run: npm ci --prefer-offline --no-audit
+
+      - name: Github Pages Build
+        run: npm run generate:gh-pages
+        env:
+          REST_API_URL: ${{ secrets.REST_API_URL }}
+          SCIENTIFIC_SERVICE_URL: ${{ secrets.SCIENTIFIC_SERVICE_URL }}
+          OEB_LEGACY_ANGULAR_URI: ${{ secrets.OEB_LEGACY_ANGULAR_URI }}
+          VRE_URI: ${{ secrets.VRE_URI }}
+          OBSERVATORY_URI: ${{ secrets.OBSERVATORY_URI }}
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist