From 8bf6911d4b7222af1a85212aada0c8a23da47631 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 7 Mar 2023 20:23:44 +0900
Subject: [PATCH] refactor(dev): separate test workflows

---
 .github/workflows/test-backend.yml            | 59 +++++++++++++++++++
 .../workflows/{test.yml => test-frontend.yml} | 54 +----------------
 2 files changed, 61 insertions(+), 52 deletions(-)
 create mode 100644 .github/workflows/test-backend.yml
 rename .github/workflows/{test.yml => test-frontend.yml} (64%)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
new file mode 100644
index 0000000000..44b6b4ba7e
--- /dev/null
+++ b/.github/workflows/test-backend.yml
@@ -0,0 +1,59 @@
+name: Test (backend)
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  jest:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    services:
+      postgres:
+        image: postgres:13
+        ports:
+          - 54312:5432
+        env:
+          POSTGRES_DB: test-misskey
+          POSTGRES_HOST_AUTH_METHOD: trust
+      redis:
+        image: redis:6
+        ports:
+          - 56312:6379
+
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        submodules: true
+    - name: Install pnpm
+      uses: pnpm/action-setup@v2
+      with:
+        version: 7
+        run_install: false
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3.6.0
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'pnpm'
+    - run: corepack enable
+    - run: pnpm i --frozen-lockfile
+    - name: Check pnpm-lock.yaml
+      run: git diff --exit-code pnpm-lock.yaml
+    - name: Copy Configure
+      run: cp .github/misskey/test.yml .config
+    - name: Build
+      run: pnpm build
+    - name: Test
+      run: pnpm jest-and-coverage
+    - name: Upload Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./packages/backend/coverage/coverage-final.json
diff --git a/.github/workflows/test.yml b/.github/workflows/test-frontend.yml
similarity index 64%
rename from .github/workflows/test.yml
rename to .github/workflows/test-frontend.yml
index 9135b4f60a..c0753b8fb5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test-frontend.yml
@@ -1,4 +1,4 @@
-name: Test
+name: Test (frontend)
 
 on:
   push:
@@ -8,57 +8,7 @@ on:
   pull_request:
 
 jobs:
-  jest:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.x]
-
-    services:
-      postgres:
-        image: postgres:13
-        ports:
-          - 54312:5432
-        env:
-          POSTGRES_DB: test-misskey
-          POSTGRES_HOST_AUTH_METHOD: trust
-      redis:
-        image: redis:6
-        ports:
-          - 56312:6379
-
-    steps:
-    - uses: actions/checkout@v3.3.0
-      with:
-        submodules: true
-    - name: Install pnpm
-      uses: pnpm/action-setup@v2
-      with:
-        version: 7
-        run_install: false
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.6.0
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'pnpm'
-    - run: corepack enable
-    - run: pnpm i --frozen-lockfile
-    - name: Check pnpm-lock.yaml
-      run: git diff --exit-code pnpm-lock.yaml
-    - name: Copy Configure
-      run: cp .github/misskey/test.yml .config
-    - name: Build
-      run: pnpm build
-    - name: Test
-      run: pnpm jest-and-coverage
-    - name: Upload Coverage
-      uses: codecov/codecov-action@v3
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: ./packages/backend/coverage/coverage-final.json
-
-  e2e:
+  cypress:
     runs-on: ubuntu-latest
 
     strategy: