From c72d65e7ef868f35117969cee9daeedbcc941492 Mon Sep 17 00:00:00 2001 From: Jay Moran Date: Tue, 1 Oct 2024 20:34:51 -0700 Subject: [PATCH 1/4] Update mongo to v5 --- docker/dbmongo/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/dbmongo/Dockerfile b/docker/dbmongo/Dockerfile index b3dae6d7a..d705c9c68 100644 --- a/docker/dbmongo/Dockerfile +++ b/docker/dbmongo/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build stage with all necessary files -FROM mongo:4.4.18 AS builder +FROM mongo:5.0.29 AS builder WORKDIR /opt/ @@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y dos2unix && \ apt-get clean # Stage 2: Final runtime image -FROM mongo:4.4.18 +FROM mongo:5.0.29 # Copy required configurations and scripts from the builder stage COPY --from=builder /etc/mongod.conf /etc/ From 1ababe1500bb0c6a59b9ba8ae06c387141c95ab9 Mon Sep 17 00:00:00 2001 From: Jay Moran Date: Mon, 7 Oct 2024 09:07:20 -0700 Subject: [PATCH 2/4] 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 From 4d3a256874141751743d40fdfe206a9cc22be824 Mon Sep 17 00:00:00 2001 From: Jay Moran Date: Mon, 7 Oct 2024 09:16:51 -0700 Subject: [PATCH 3/4] Fix aliro-unit_tester name on actions --- .github/workflows/aliro_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aliro_tests.yml b/.github/workflows/aliro_tests.yml index 46862c835..36299e038 100644 --- a/.github/workflows/aliro_tests.yml +++ b/.github/workflows/aliro_tests.yml @@ -83,7 +83,7 @@ jobs: run: | git lfs fetch --all git lfs pull - docker run -v $(pwd):/appsrc -w /appsrc aliro_unit_tester coverage run -m nose -s -v ai/tests/test_sklearn_api.py + docker run -v $(pwd):/appsrc -w /appsrc aliro-unit_tester coverage run -m nose -s -v ai/tests/test_sklearn_api.py coverage combine - name: Coveralls uses: AndreMiras/coveralls-python-action@develop From e5831d6d02bdb9f4a982478d77291f9bcdb5019d Mon Sep 17 00:00:00 2001 From: Jay Moran Date: Mon, 7 Oct 2024 10:52:29 -0700 Subject: [PATCH 4/4] Omit surprise from coveralls --- .coveragerc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.coveragerc b/.coveragerc index 630da522e..f72050cc5 100644 --- a/.coveragerc +++ b/.coveragerc @@ -9,6 +9,10 @@ relative_files = True ; regardless of whether it runs locally or within a Docker container. parallel = True +; omit scikit-surprise (custom package) GH runner tests Coveralls on python3.12? +omit = + /src/scikit-surprise/surprise/* + [paths] ; the first path is the path on the local (travis) filesystem ; the second path is the path as it appears within the Docker container