From 1ababe1500bb0c6a59b9ba8ae06c387141c95ab9 Mon Sep 17 00:00:00 2001 From: Jay Moran Date: Mon, 7 Oct 2024 09:07:20 -0700 Subject: [PATCH] Refactor docker-compose commands for integration and unit tests --- .github/workflows/aliro_tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/aliro_tests.yml b/.github/workflows/aliro_tests.yml index f205c9cf4..46862c835 100644 --- a/.github/workflows/aliro_tests.yml +++ b/.github/workflows/aliro_tests.yml @@ -26,13 +26,13 @@ jobs: # Runs a single command using the runners shell - name: Build Docker Images - run: docker-compose -f ./docker-compose-int-test.yml build -m 8g + run: docker compose -f ./docker-compose-int-test.yml build -m 8g # Runs a set of commands using the runners shell - name: Run Integration Tests run: | - docker-compose -f ./docker-compose-int-test.yml run tester bash -c "sh /root/wait_pennai.sh && npm test" - docker-compose -f ./docker-compose-int-test.yml down + docker compose -f ./docker-compose-int-test.yml run tester bash -c "sh /root/wait_pennai.sh && npm test" + docker compose -f ./docker-compose-int-test.yml down build_web_app: name: Unit Tests for Webapp @@ -50,13 +50,13 @@ jobs: # Runs a single command using the runners shell - name: Build Docker Images run: | - docker-compose -f ./docker-compose-unit-test.yml build -m 8g + docker compose -f ./docker-compose-unit-test.yml build -m 8g # Runs a set of commands using the runners shell - name: Run Unit Tests run: | git lfs fetch --all - docker-compose -f ./docker-compose-unit-test.yml up --abort-on-container-exit -V + docker compose -f ./docker-compose-unit-test.yml up --abort-on-container-exit -V - name: Coveralls uses: AndreMiras/coveralls-python-action@develop with: @@ -77,7 +77,7 @@ jobs: - name: Build Docker Images run: | pip install coveralls - docker-compose -f ./docker-compose-unit-test.yml build -m 8g + docker compose -f ./docker-compose-unit-test.yml build -m 8g # Runs a set of commands using the runners shell - name: Run Unit Tests run: | @@ -145,11 +145,11 @@ jobs: - name: Build Docker Images run: | - docker-compose -f ./docker-compose-doc-builder.yml build -m 8g + docker compose -f ./docker-compose-doc-builder.yml build -m 8g # Building docs # Tell GitHub not to use jekyll to compile the docs - name: Building Docs run: | - docker-compose -f ./docker-compose-doc-builder.yml up --abort-on-container-exit --force-recreate + docker compose -f ./docker-compose-doc-builder.yml up --abort-on-container-exit --force-recreate sudo touch target/ai_docs/html/.nojekyll - name: Deploy uses: JamesIves/github-pages-deploy-action@3.7.1