Merge branch 'main' into issue-1259/schedule-item-view-add-video-reco…

…rding-urls
emfcamp · Aug 9, 2024 · b310430 · b310430
2 parents 4e4c0f7 + 57f86ed
commit b310430
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -20,12 +20,10 @@ jobs:
       COVERALLS_GIT_BRANCH: ${{ github.ref }}
     steps:
       - uses: actions/checkout@v4
-      - name: Fetch latest docker-compose
-        run: sudo curl -L "https://github.com/docker/compose/releases/download/1.25.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
       - name: Build containers
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
       - name: Test
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test
   build:
     runs-on: ubuntu-latest
     needs: test

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -14,9 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Fetch latest docker-compose
-        run: sudo curl -L "https://github.com/docker/compose/releases/download/1.25.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
       - name: Build containers
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
       - name: Test
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test