Merge branch 'master' into sbruens/macos-click

Jigsaw-Code · Feb 21, 2024 · 091d002 · 091d002
2 parents 166ae71 + e263a87
commit 091d002
Show file tree

Hide file tree

Showing 249 changed files with 66,073 additions and 4,585 deletions.
diff --git a/.github/workflows/build_and_test_debug.yml → ...workflows/build_and_test_debug_client.yml b/.github/workflows/build_and_test_debug.yml → ...workflows/build_and_test_debug_client.yml
@@ -1,7 +1,7 @@
-name: Build and Test
+name: Build and Test / Client
 
 concurrency:
-  group: ${{ github.head_ref || github.ref }}
+  group: '${{ github.head_ref || github.ref }} Client'
   cancel-in-progress: true
 
 on:
@@ -26,11 +26,12 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
+          cache-dependency-path: ./package-lock.json
 
       - name: Install NPM Dependencies
-        run: npm ci
+        run: npm set cache .npm && npm ci
 
       - name: Run Linter
         run: npm run action lint
@@ -58,8 +59,9 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
+          cache-dependency-path: ./package-lock.json
 
       - name: Install NPM Dependencies
         run: npm ci
@@ -87,8 +89,9 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
+          cache-dependency-path: ./package-lock.json
 
       - name: Install NPM Dependencies
         run: npm ci
@@ -116,8 +119,9 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
+          cache-dependency-path: ./package-lock.json
 
       - name: Install NPM Dependencies
         run: npm ci
@@ -157,8 +161,9 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
+          cache-dependency-path: ./package-lock.json
 
       - name: Install NPM Dependencies
         run: npm ci
@@ -198,8 +203,9 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
+          cache-dependency-path: ./package-lock.json
 
       - name: Install NPM Dependencies
         run: npm ci
@@ -236,8 +242,9 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
+          cache-dependency-path: ./package-lock.json
 
       - name: Install NPM Dependencies
         run: npm ci

diff --git a/.github/workflows/build_and_test_debug_manager.yml b/.github/workflows/build_and_test_debug_manager.yml
@@ -0,0 +1,129 @@
+name: Build and Test / Manager
+
+concurrency:
+  group: '${{ github.head_ref || github.ref }} Manager'
+  cancel-in-progress: true
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches:
+      - master
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: ./server_manager/package.json
+
+      - name: Install NPM Dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+  web_test:
+    name: Web Test
+    runs-on: ubuntu-latest
+    needs: lint
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: ./server_manager/package.json
+
+      - name: Install NPM Dependencies
+        run: npm ci
+
+      - name: Manager Web Test
+        run: npm run action server_manager/test
+
+  linux_debug_build:
+    name: Linux Debug Build
+    runs-on: ubuntu-latest
+    needs: web_test
+    env:
+      SENTRY_DSN: debug
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: ./server_manager/package.json
+
+      - name: Install NPM Dependencies
+        run: npm ci
+
+      - name: Build Linux Manager
+        run: npm run action server_manager/electron_app/build linux
+
+  windows_debug_build:
+    name: Windows Debug Build
+    # TODO(daniellacosse): port bash scripts to windows so we can build the manager on windows
+    runs-on: ubuntu-latest
+    needs: web_test
+    env:
+      SENTRY_DSN: debug
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: ./server_manager/package.json
+
+      - name: Install NPM Dependencies
+        run: npm ci
+
+      - name: Build Windows Manager
+        run: npm run action server_manager/electron_app/build windows
+
+  mac_debug_build:
+    name: MacOS Debug Build
+    runs-on: macos-11
+    needs: web_test
+    env:
+      SENTRY_DSN: debug
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: ./server_manager/package.json
+
+      - name: Install NPM Dependencies
+        run: npm ci
+
+      - name: Set XCode Version
+        run: sudo xcode-select -switch /Applications/Xcode_13.2.app
+
+      - name: Build MacOS Manager
+        run: npm run action server_manager/electron_app/build macos
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@
 *.pdb
 *.sw?
 /node_modules
+/server_manager/node_modules
+/server_manager/do_install_script.ts
+/server_manager/gcp_install_script.ts
 /build
 /output
 /platforms

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -6,21 +6,30 @@ module.exports = {
       'always',
       [
         'build',
-        'cordova',
-        'cordova/android',
-        'cordova/apple',
-        'cordova/apple/ios',
-        'cordova/apple/macos',
+        'client/cordova',
+        'client/cordova/android',
+        'client/cordova/apple',
+        'client/cordova/apple/ios',
+        'client/cordova/apple/macos',
+        'client/electron',
+        'client/electron/linux',
+        'client/electron/windows',
         'devtools',
         'docs',
-        'electron',
-        'electron/linux',
-        'electron/windows',
-        'www',
+        'manager',
+        'manager/linux',
+        'manager/mac',
+        'manager/windows',
         'service',
         'service/linux',
         'service/windows',
+        'www',
       ],
     ],
+    'type-enum': [
+      2,
+      'always',
+      ['build', 'chore', 'ci', 'docs', 'feat', 'fix', 'perf', 'proposal', 'refactor', 'revert', 'style', 'test'],
+    ],
   },
 };