Merge pull request #1379 from kuzudb/code-cov-rebuild

Code cov rebuild
kuzudb · Mar 14, 2023 · d0b833a · d0b833a
2 parents 2e86214 + 5901be4
commit d0b833a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 27 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -19,31 +19,13 @@ jobs:
       - name: Ensure Python dependencies
         run: |
           pip install torch~=1.13 --extra-index-url https://download.pytorch.org/whl/cpu &&\
-          pip install --user -r tools/python_api/requirements_dev.txt
+          pip install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-1.13.0+cpu.html
 
-      - name: Build
-        run: CC=gcc CXX=g++ make release NUM_THREADS=32
-
-      - name: Test
-        run: CC=gcc CXX=g++ make test NUM_THREADS=32
+      - name: Test with coverage
+        run: CC=gcc CXX=g++ make lcov NUM_THREADS=32
 
       - name: Python test
-        run: CC=gcc CXX=g++ make pytest NUM_THREADS=32
-
-  test-coverage-report:
-    name: test coverage report
-    needs: [gcc-build-test]
-    runs-on: code-coverage
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Ensure Python dependencies
-        run: |
-          pip install torch~=1.13 --extra-index-url https://download.pytorch.org/whl/cpu &&\
-          pip install --user -r tools/python_api/requirements_dev.txt
-
-      - name: Run tests
-        run: CC=gcc CXX=g++ make lcov NUM_THREADS=32
+        run: CC=clang-14 CXX=clang++-14 make pytest NUM_THREADS=32
 
       - name: Generate coverage report
         run: |
@@ -54,7 +36,6 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           file: cover.info
-          token: ${{ secrets.CODECOV_TOKEN }}
 
   gcc-build-test-with-asan:
     name: gcc build & test with asan
@@ -66,7 +47,7 @@ jobs:
       - name: Ensure Python dependencies
         run: |
           pip install torch~=1.13 --extra-index-url https://download.pytorch.org/whl/cpu &&\
-          pip install --user -r tools/python_api/requirements_dev.txt
+          pip install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-1.13.0+cpu.html
 
       - name: Build debug
         run: CC=gcc CXX=g++ make alldebug NUM_THREADS=32
@@ -96,7 +77,7 @@ jobs:
       - name: Ensure python dependencies
         run: |
           pip install torch~=1.13 --extra-index-url https://download.pytorch.org/whl/cpu &&\
-          pip install --user -r tools/python_api/requirements_dev.txt
+          pip install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-1.13.0+cpu.html
 
       - name: Build
         run: CC=clang-14 CXX=clang++-14 make release NUM_THREADS=32
@@ -129,7 +110,7 @@ jobs:
       - name: Ensure Python dependencies
         run: |
           pip install torch~=1.13 --extra-index-url https://download.pytorch.org/whl/cpu &&\
-          pip install --user -r tools/python_api/requirements_dev.txt
+          pip install --user -r tools/python_api/requirements_dev.txt -f https://data.pyg.org/whl/torch-1.13.0+cpu.html
 
       - name: Build
         run: make benchmark NUM_THREADS=30

diff --git a/scripts/dockerized-ci-tests-runner/Dockerfile b/scripts/dockerized-ci-tests-runner/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 # Install dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends apt-utils
-RUN apt-get update && apt-get install -y g++ gcc clang-14 python3-dev python3-pip python-is-python3 cmake nodejs jq curl apt-transport-https gnupg sudo git clang-format-11 ca-certificates lsb-release wget
+RUN apt-get update && apt-get install -y g++ gcc clang-14 python3-dev python3-pip python-is-python3 cmake nodejs jq curl apt-transport-https gnupg sudo git clang-format-11 ca-certificates lsb-release wget lcov
 
 RUN useradd --create-home runner
 USER runner