[beta] Dev. upstream

DIDIRUS4 · Jan 31, 2024 · e3c9534 · e3c9534
1 parent 3ff0ff2
commit e3c9534
Show file tree

Hide file tree

Showing 99 changed files with 6,135 additions and 2,684 deletions.
diff --git a/.github/workflows/cli-build.yml b/.github/workflows/cli-build.yml
@@ -2,7 +2,7 @@ name: CLI Build + Lint
 
 on:
   push:
-    branches: [ master ]
+    branches: [ beta ]
   pull_request:
 env:
   CARGO_TERM_COLOR: always

diff --git a/.github/workflows/gui-build.yml b/.github/workflows/gui-build.yml
@@ -2,7 +2,7 @@ name: GUI Build + Lint
 
 on:
   push:
-    branches: [master]
+    branches: [ beta ]
   pull_request:
 jobs:
   build:

diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml
@@ -1,14 +1,14 @@
 name: 'Tauri GUI Build'
 on:
   push:
-    branches: [ master ]
+    branches: [ beta ]
   pull_request:
 jobs:
   test-tauri:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
+        platform: [windows-latest, ubuntu-20.04, ubuntu-22.04]
 
     runs-on: ${{ matrix.platform }}
     defaults:

diff --git a/.gitignore b/.gitignore
@@ -112,3 +112,4 @@ fabric.properties
 
 theseus.iml
 
+/theseus_gui/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: GUI Build + Lint @@
     on:
       push:
-        branches: [master]
+        branches: [ beta ]
       pull_request:
     jobs:
       build:
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -112,3 +112,4 @@ fabric.properties

		theseus.iml

		/theseus_gui/pnpm-lock.yaml