Merge branch 'main' into prod-bootstrap

XRPLF · Oct 31, 2023 · 2e60a8b · 2e60a8b
2 parents 9f34ee8 + a0b6b20
commit 2e60a8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, heavy]
     timeout-minutes: 10
     strategy:
       matrix:
@@ -34,18 +34,17 @@ jobs:
           path: /home/runner/.local
           key: dotlocal-${{ matrix.python-version }}-${{ env.POETRY_VERSION }}
 
+      - name: Install Python + Retrieve Poetry dependencies from cache
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
       - name: Install poetry
         if: steps.cache-poetry.outputs.cache-hit != 'true'
         run: |
           curl -sSL https://install.python-poetry.org/ | python - --version ${{ env.POETRY_VERSION }}
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
-      - name: Install Python + Retrieve Poetry dependencies from cache
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-
       - name: Display Python version
         run: |
           python -c "import sys; print(sys.version)"

diff --git a/xbridge_cli/server/start.py b/xbridge_cli/server/start.py
@@ -32,7 +32,7 @@
     )
 )
 
-_DOCKER_COMPOSE = ["docker", "compose", "-f", _DOCKER_COMPOSE_FILE]
+_DOCKER_COMPOSE = ["docker-compose", "-f", _DOCKER_COMPOSE_FILE]
 
 _START_UP_TIME = 30  # seconds
 _WAIT_INCREMENT = 0.5  # seconds