diff --git a/.github/workflows/icd_tests_linux.yml b/.github/workflows/icd_tests_linux.yml index 357648a00..ce1bd3520 100644 --- a/.github/workflows/icd_tests_linux.yml +++ b/.github/workflows/icd_tests_linux.yml @@ -92,9 +92,15 @@ jobs: shell: bash run: | BUILD_DIR=$GITHUB_WORKSPACE/build-${{ matrix.os_version }} + ICD_RXJS_DIR=$BUILD_DIR/ICD-RxJS apptainer exec --bind $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --pwd $BUILD_DIR ${{ matrix.image }} /bin/bash -c "\ - git clone https://github.com/CARTAvis/ICD-RxJS.git && \ - cd ICD-RxJS && \ + if [ -d '$ICD_RXJS_DIR' ]; then + cd $ICD_RXJS_DIR && git pull + else + echo 'Cloning ICD-RxJS repository...' + git clone https://github.com/CARTAvis/ICD-RxJS.git + cd ICD-RxJS + fi && \ git checkout ${{ env.ICD_RXJS_BRANCH_NAME }} && \ git submodule init && git submodule update && npm install && \ cd protobuf && \ @@ -137,9 +143,8 @@ jobs: TEST_STAGE="file_browser" SRC_DIR=$GITHUB_WORKSPACE/source BUILD_DIR=$GITHUB_WORKSPACE/build-${{ matrix.os_version }} - TEST_DIR=$GITHUB_WORKSPACE/build-${{ matrix.os_version }}/ICD-RxJS LOG_FILE="/tmp/carta_icd_${{ matrix.os_version }}_${TEST_STAGE}.log" - apptainer exec --bind $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --pwd $BUILD_DIR ${{ matrix.image }} /bin/bash -c "\ + apptainer exec --bind $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --bind /images:/images --pwd $BUILD_DIR ${{ matrix.image }} /bin/bash -c "\ # Start carta_backend ASAN_OPTIONS=suppressions=$SRC_DIR/debug/asan/myasan.supp \ LSAN_OPTIONS=suppressions=$SRC_DIR/debug/asan/myasan-leaks.supp \ @@ -155,7 +160,9 @@ jobs: CARTA_BACKEND_PID=$! && \ echo 'carta_backend started with PID: $CARTA_BACKEND_PID' && \ # Run ICD tests - cd $TEST_DIR && \ + pwd && ls && \ + cd ICD-RXJS && \ + pwd && ls && \ TEST_FILES=$(cat ICD_test_stages/${TEST_STAGE}.tests) && \ for test_file in $TEST_FILES; do npm test -- $test_file @@ -198,9 +205,8 @@ jobs: TEST_STAGE="animator" SRC_DIR=$GITHUB_WORKSPACE/source BUILD_DIR=$GITHUB_WORKSPACE/build-${{ matrix.os_version }} - TEST_DIR=$GITHUB_WORKSPACE/build-${{ matrix.os_version }}/ICD-RxJS LOG_FILE="/tmp/carta_icd_${{ matrix.os_version }}_${TEST_STAGE}.log" - apptainer exec --bind $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --pwd $BUILD_DIR ${{ matrix.image }} /bin/bash -c "\ + apptainer exec --bind $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --bind /images:/images --pwd $BUILD_DIR ${{ matrix.image }} /bin/bash -c "\ # Start carta_backend ASAN_OPTIONS=suppressions=$SRC_DIR/debug/asan/myasan.supp \ LSAN_OPTIONS=suppressions=$SRC_DIR/debug/asan/myasan-leaks.supp \ @@ -216,7 +222,7 @@ jobs: CARTA_BACKEND_PID=$! && \ echo 'carta_backend started with PID: $CARTA_BACKEND_PID' && \ # Run ICD tests - cd $TEST_DIR && \ + cd ICD-RxJS && \ TEST_FILES=$(cat ICD_test_stages/${TEST_STAGE}.tests) && \ for test_file in $TEST_FILES; do npm test -- $test_file