From 5abaa1adeab1abb6677129778f8b8735bb0decf5 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 22 Feb 2024 14:15:48 -0800 Subject: [PATCH] Remove debugging comments --- .github/workflows/build_and_test.yml | 4 --- .github/workflows/ci_tests.yml | 30 +++++++++++------------ scripts/ci_build_and_test_in_container.sh | 2 -- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 8f9fbb93466..8e8cb20f1f5 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -146,13 +146,9 @@ jobs: # pygeosx testing ENABLE_PYGEOSX=${{ inputs.ENABLE_PYGEOSX }} - echo "********************************* ENABLE_PYGEOSX: ${ENABLE_PYGEOSX}" docker_args+=(-e ENABLE_PYGEOSX=${ENABLE_PYGEOSX:-OFF}) if [ "${{ inputs.ENABLE_PYGEOSX }}" == 'ON' ]; then - echo "******************** RUN_PYGEOSX_TESTS string ADDED" script_args+=(--run-pygeosx-tests) - else - echo "******************** RUN_PYGEOSX_TESTS string NOT ADDED" fi docker_args+=(--cap-add=SYS_PTRACE --rm) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 540e083258f..49224c06825 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -208,21 +208,21 @@ jobs: GCP_BUCKET: geosx/integratedTests RUNS_ON: ubuntu-22.04 - # code_coverage: - # needs: - # - is_not_draft_pull_request - # uses: ./.github/workflows/build_and_test.yml - # secrets: inherit - # with: - # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" - # CMAKE_BUILD_TYPE: Debug - # CODE_COVERAGE: true - # DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} - # DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GCP_BUCKET: geosx/ubuntu22.04-gcc11 - # RUNS_ON: Runner_4core_16GB + code_coverage: + needs: + - is_not_draft_pull_request + uses: ./.github/workflows/build_and_test.yml + secrets: inherit + with: + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" + CMAKE_BUILD_TYPE: Debug + CODE_COVERAGE: true + DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} + DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GCP_BUCKET: geosx/ubuntu22.04-gcc11 + RUNS_ON: Runner_4core_16GB # If the 'ci: ready to be merged' PR label is found, the cuda jobs run immediately along side linux jobs. # Note: CUDA jobs should only be run if PR is ready to merge. diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 335a15ec441..7d90d71561c 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -267,8 +267,6 @@ if [[ "${RUN_PYGEOSX_TESTS}" = true ]]; then or_die ninja pygeosx or_die ninja geosx_python_tools or_die ninja pygeosx_unit_tests -else - echo "**************************** DID NOT RUN_PYGEOSX_TESTS" fi if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then