Merge magicspace changes (update)

mufancom · Aug 12, 2023 · 2e18ec0 · 2e18ec0
2 parents 0a57d9d + 7d6d224
commit 2e18ec0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,10 +2,10 @@ name: CI
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - master
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.magicspace/boilerplate.json b/.magicspace/boilerplate.json
@@ -6,6 +6,7 @@
     "repository": "https://github.com/makeflow/mufan-code-boilerplates.git",
     "license": "MIT",
     "author": "Chengdu Mufan Technology Co., Ltd.",
+    "defaultBranch": "master",
     "projects": [
       {
         "name": "general-composables",