Merge branch 'main' into renovate/lock-file-maintenance

reearth · May 2, 2023 · f69401e · f69401e
2 parents 0b49e72 + cc024b2
commit f69401e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 277 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/ci_collect_info.yml b/.github/workflows/ci_collect_info.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
     info:
-        name: Collect information(server build)
+        name: Collect information
         runs-on: ubuntu-latest
         if: ${{ github.event.workflow_run.conclusion != 'failure' && github.event.repository.full_name == 'reearth/reearth' && (startsWith(github.event.workflow_run.head_branch, 'release/') || github.event.workflow_run.head_branch == 'main' || !startsWith(github.event.head_commit.message, 'v')) }}
         outputs:

diff --git a/.github/workflows/ci_server.yml b/.github/workflows/ci_server.yml
@@ -10,8 +10,9 @@ on:
 
 jobs:
   ci:
-    name: Check server change
+    name: ci
     runs-on: ubuntu-latest
+    if: github.event_name != 'push' || !startsWith(github.event.head_commit.message, 'v')
     defaults:
       run:
         working-directory: server

diff --git a/.github/workflows/ci_web.yml b/.github/workflows/ci_web.yml
@@ -10,8 +10,9 @@ on:
 
 jobs:
   ci:
-    name: Check and build web change
+    name: ci
     runs-on: ubuntu-latest
+    if: github.event_name != 'push' || !startsWith(github.event.head_commit.message, 'v')
     defaults:
       run:
         working-directory: web

diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml