#97: dockerfile fixes for ubuntu tests

DARMA-tasking · Sep 6, 2024 · d31e047 · d31e047
1 parent 29c5e10
commit d31e047
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 47 deletions.
diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml
@@ -64,52 +64,10 @@ jobs:
           echo "CXX=$(which ${{ matrix.host.compiler.cxx }})" >> $GITHUB_ENV
           echo "GCOV=$(which ${{ matrix.host.gcov }})" >> $GITHUB_ENV
 
-      - name: Install dependencies (macOS)
-        if: ${{ runner.os ==  'macOS'}}
+      - name: Install dependencies
         run: |
           brew update && brew install coreutils lcov xquartz
 
-      - name: Install dependencies (Ubuntu)
-        if: ${{ runner.os ==  'Linux' }}
-        run: |
-          sudo apt-get update -y -q && \
-          sudo apt-get install -y -q --no-install-recommends \
-          ${{ matrix.host.compiler.cc }} \
-          ${{ matrix.host.compiler.cxx }} \
-          git \
-          xz-utils \
-          bzip2 \
-          zip \
-          gpg \
-          wget \
-          gpgconf \
-          software-properties-common \
-          libsigsegv2 \
-          libsigsegv-dev \
-          pkg-config \
-          zlib1g \
-          zlib1g-dev \
-          m4 \
-          gfortran-11 \
-          make \
-          cmake-data \
-          cmake \
-          pkg-config \
-          libncurses5-dev \
-          m4 \
-          libgl1-mesa-dev \
-          libglu1-mesa-dev \
-          mesa-common-dev \
-          libosmesa6-dev \
-          mesa-utils \
-          perl \
-          curl \
-          xvfb \
-          lcov  \
-          && \
-          sudo apt-get clean && \
-          sudo rm -rf /var/lib/apt/lists/*
-
       - name: Load cache (VTK, Miniconda3)
         id: base-cache
         uses: actions/cache@v4

diff --git a/ci/python_build.sh b/ci/python_build.sh
@@ -6,22 +6,21 @@ set -ex
 
 CURRENT_DIR="$(dirname -- "$(realpath -- "$0")")"
 PARENT_DIR="$(dirname "$CURRENT_DIR")"
+CONDA_PATH=${CONDA_PATH:-"/opt/conda"}
 
 VT_TV_SRC_DIR=${VT_TV_SRC_DIR:-$PARENT_DIR}
 
 for env in $(conda env list | grep 'py*' | perl -lane 'print $F[-1]' | xargs ls -lrt1d |  perl -lane 'print $F[-1]' | sed -r 's/^.*\/(.*)$/\1/'); do
-    # Clear vizualization output directory
-    rm -rf $VT_TV_OUTPUT_DIR/python_tests/*
-
     echo "::group::Test Python Bindings (${python_version})"
 
     # Activate conda environment
     . $CONDA_PATH/etc/profile.d/conda.sh && conda activate env
 
-    # Build
+    # Build VT-TV python package
     pip install PyYAML
     pip install $VT_TV_SRC_DIR
 
+    # Deactivate conda environment
     conda deactivate
 
     echo "::endgroup::"

diff --git a/ci/python_test.sh b/ci/python_test.sh
@@ -33,6 +33,7 @@ for env in $(conda env list | grep 'py*' | perl -lane 'print $F[-1]' | xargs ls
         python $VT_TV_SRC_DIR/tests/test_bindings.py
     fi
 
+    # Deactivate conda environment
     conda deactivate
 
     echo "::endgroup::"