merge conflicts

cornell-dti · Sep 25, 2024 · c8dcb06 · c8dcb06
2 parents 539fe2d + 2b5a978
commit c8dcb06
Show file tree

Hide file tree

Showing 80 changed files with 21,524 additions and 43,561 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,3 @@
 node_modules
 build
+tests
diff --git a/.github/workflows/ci-backend-test.yml b/.github/workflows/ci-backend-test.yml
@@ -25,8 +25,8 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - name: Install Server Dependencies
         run: npm run install:server
-      - name: Test Server
-        run: npm run test:server
+      # - name: Test Server
+      #   run: npm run test:server
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - name: Install Dependencies
         run: npm install
       - name: Build Frontend

diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '20.x'
       - name: Install Dependencies
         run: npm install
       - name: Run Linter