Merge branch 'develop' into #177-Graph-Screen-Improvements

Northeastern-Electric-Racing · Oct 28, 2024 · 225467f · 225467f
2 parents 2eea248 + 494b8f7
commit 225467f
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 120 deletions.
diff --git a/.github/.DS_Store b/.github/.DS_Store
diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
@@ -22,6 +22,7 @@ jobs:
           sudo apt-get -y update
           sudo apt-get -y install docker-compose
       - name: Build Docker Compose
+        working-directory: compose
         run: |
           if ! docker-compose build; then
             echo "Docker Compose build failed."

diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
@@ -57,6 +57,6 @@ jobs:
           provenance: false
           build-args: |
             PROD=true
-            BACKEND_URL=http://192.168.100.1:8000
+            BACKEND_URL=http://192.168.100.11:8000
             MAP_ACCESS_TOKEN=pk.eyJ1IjoibWNrZWVwIiwiYSI6ImNscXBrcmU1ZTBscWIya284cDFyYjR3Nm8ifQ.6TQHlxhAJzptZyV-W28dnw
 
diff --git a/.github/workflows/scylla-tests.yml b/.github/workflows/scylla-tests.yml
@@ -24,6 +24,7 @@ jobs:
         with:
           submodules: true
       - name: Run db
+        working-directory: compose
         run: docker compose run -P -d odyssey-timescale
       - name: Generate prisma
         run: cargo prisma generate

diff --git a/ArgosIOS/.DS_Store b/ArgosIOS/.DS_Store
diff --git a/ArgosIOS/Argos/.DS_Store b/ArgosIOS/Argos/.DS_Store
diff --git a/compose.brick.yml b/compose.brick.yml
diff --git a/compose.client-dev.yml b/compose.client-dev.yml
diff --git a/compose.router.yml b/compose.router.yml
diff --git a/compose.scylla-dev.yml b/compose.scylla-dev.yml
diff --git a/compose.tpu.yml b/compose.tpu.yml
diff --git a/compose.yml b/compose.yml
diff --git a/scylla-server/.DS_Store b/scylla-server/.DS_Store