From 71614bd8b6e18476376fee71703eaab5f4c354c4 Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Fri, 2 Aug 2024 10:49:25 -0600
Subject: [PATCH 1/9] Added code coverage tracking to github action

---
 .github/workflows/github-actions.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 9182bf7d..fab35181 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -17,7 +17,16 @@ jobs:
       - run: WD=`(cd ../../.. && pwd)` && export RAVEN_LIBS_NAME="raven_libs_"`basename $WD` && ../raven/scripts/establish_conda_env.sh --install
       - run: cd ../raven && ./build_raven
       - run: ../raven/run_tests --library-report
-      - run: ../raven/run_tests -j4 --plugins --re=HERON
+      - run: > # The overhead time added by checking coverage is currently about 19% for a single run_tests. Reducing the frequency of coverage checks may be preferable if this increases.
+          ./check_py_coverage.sh -j4 &&
+          COV_PCT=`coverage report --format=total` &&
+          echo "::notice title=Coverage Summary::Code coverage for this repository is now $COV_PCT%. See 'coverage_results' in Artifacts for details."
+      - name: Archive coverage results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: coverage_results
+          path: tests/coverage_html_report
   Test-HERON-Windows:
     runs-on: [self-hosted, windows]
     steps:
@@ -33,4 +42,4 @@ jobs:
       - run: $Env:RAVEN_LIBS_NAME =  "raven_libraries_"+(Get-Location).Path.Split("\")[-4]; bash ../raven/scripts/establish_conda_env.sh --install --conda-defs $HOME/Miniconda3/etc/profile.d/conda.sh
       - run: cd ../raven; bash ./build_raven
       - run: bash ../raven/run_tests --library-report
-      - run: bash ../raven/run_tests -j4 --plugins --re=HERON
+      - run: bash ../raven/run_tests -j4 --plugins --re=HERON/tests

From ce3d5554d3ac7b5712de8ef9dda39e2a039fb36a Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Mon, 2 Sep 2024 14:10:13 -0500
Subject: [PATCH 2/9] Reworked total coverage report generation

---
 .github/workflows/github-actions.yml | 5 ++---
 check_py_coverage.sh                 | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index fab35181..5e888917 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -18,9 +18,8 @@ jobs:
       - run: cd ../raven && ./build_raven
       - run: ../raven/run_tests --library-report
       - run: > # The overhead time added by checking coverage is currently about 19% for a single run_tests. Reducing the frequency of coverage checks may be preferable if this increases.
-          ./check_py_coverage.sh -j4 &&
-          COV_PCT=`coverage report --format=total` &&
-          echo "::notice title=Coverage Summary::Code coverage for this repository is now $COV_PCT%. See 'coverage_results' in Artifacts for details."
+          CPC_OUT=`./check_py_coverage.sh -j4` &&
+          echo "::notice title=Coverage Summary::$CPC_OUT See 'coverage_results' in Artifacts for details."
       - name: Archive coverage results
         uses: actions/upload-artifact@v4
         if: always()
diff --git a/check_py_coverage.sh b/check_py_coverage.sh
index 3476e0d0..969980e4 100755
--- a/check_py_coverage.sh
+++ b/check_py_coverage.sh
@@ -72,3 +72,4 @@ DISPLAY=$DISPLAY_VAR
 coverage combine
 coverage html
 
+echo "Coverage for this repository is now `coverage report --format=total`%."

From 96f3b1a9cd85a8226a36be82c90e8118b26f181a Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Fri, 20 Sep 2024 09:44:10 -0500
Subject: [PATCH 3/9] Added script to enable simple coverage report from github
 action

---
 .github/workflows/github-actions.yml |  6 ++--
 check_py_coverage.sh                 |  3 +-
 report_py_coverage.sh                | 42 ++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 report_py_coverage.sh

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 5e888917..1ce42fa9 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -18,8 +18,10 @@ jobs:
       - run: cd ../raven && ./build_raven
       - run: ../raven/run_tests --library-report
       - run: > # The overhead time added by checking coverage is currently about 19% for a single run_tests. Reducing the frequency of coverage checks may be preferable if this increases.
-          CPC_OUT=`./check_py_coverage.sh -j4` &&
-          echo "::notice title=Coverage Summary::$CPC_OUT See 'coverage_results' in Artifacts for details."
+          ./check_py_coverage.sh -j4 &&
+          DATA_FILE=`pwd`/.coverage && COV_RCFILE=`pwd`/tests/.coveragerc &&
+          COV_RPT=`report_py_coverage.sh --data-file=$DATA_FILE --coverage-rc-file=$COV_RCFILE` &&
+          echo "::notice title=Coverage Summary::$COV_RPT For details, download 'coverage_results' from Artifacts, extract all files, and open 'index.html'."
       - name: Archive coverage results
         uses: actions/upload-artifact@v4
         if: always()
diff --git a/check_py_coverage.sh b/check_py_coverage.sh
index 969980e4..30fa7606 100755
--- a/check_py_coverage.sh
+++ b/check_py_coverage.sh
@@ -72,4 +72,5 @@ DISPLAY=$DISPLAY_VAR
 coverage combine
 coverage html
 
-echo "Coverage for this repository is now `coverage report --format=total`%."
+# See report_py_coverage.sh file for explanation of script separation
+($SCRIPT_DIR/report_py_coverage.sh --data-file=$COVERAGE_FILE --coverage-rc-file=$COVERAGE_RCFILE)
diff --git a/report_py_coverage.sh b/report_py_coverage.sh
new file mode 100644
index 00000000..27514c41
--- /dev/null
+++ b/report_py_coverage.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# To be run after a run of check_py_coverage.sh
+# This script has been separated from check_py_coverage.sh for the github action, so that
+#   the output of run_tests within check_py_coverage.sh can be printed, but the report
+#   value can be caught and put in an annotation. This is necessary because calling
+#   "coverage report --format=total" directly in the yaml does not work
+
+SCRIPT_DIRNAME=`dirname $0`
+cd $SCRIPT_DIRNAME
+
+if ! which coverage > /dev/null 2>&1
+then
+  echo "Could not find coverage module"
+  exit 1
+fi
+
+# read command-line arguments
+ARGS=()
+for A in "$@"
+do
+  case $A in
+    --data-file=*)
+      export COVERAGE_FILE="${A#--data-file=}"  # Removes "--data-file=" and puts path into env variable
+      ;;
+    --coverage-rc-file=*)
+      export COVERAGE_RCFILE="${A#--coverage-rc-file=}"  # See above
+      ;;
+    *)
+      ARGS+=("$A")
+      ;;
+  esac
+done
+
+COV_VAL=`coverage report --format=total "${ARGS[@]}"`
+if [[ $COV_VAL = "No data to report." ]]
+then
+  echo "Could not find data file with coverage results."
+  exit 0
+fi
+
+echo "Coverage for this repository is now $COV_VAL%."

From 9c6bc7f2d34916d42f6cf9b17c97dc997d61032d Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Mon, 23 Sep 2024 13:02:22 -0500
Subject: [PATCH 4/9] Debugging coverage scripts

---
 .github/workflows/github-actions.yml | 7 +++++--
 check_py_coverage.sh                 | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 1ce42fa9..a8849831 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -17,10 +17,13 @@ jobs:
       - run: WD=`(cd ../../.. && pwd)` && export RAVEN_LIBS_NAME="raven_libs_"`basename $WD` && ../raven/scripts/establish_conda_env.sh --install
       - run: cd ../raven && ./build_raven
       - run: ../raven/run_tests --library-report
-      - run: > # The overhead time added by checking coverage is currently about 19% for a single run_tests. Reducing the frequency of coverage checks may be preferable if this increases.
+      # The overhead time added by checking coverage is currently about 19% for a single run_tests.
+      # Reducing the frequency of coverage checks may be preferable if this increases.
+      # report_py_coverage is being called twice, once within check_py_coverage to print to the terminal and once here to get data for the annotation
+      - run: >
           ./check_py_coverage.sh -j4 &&
           DATA_FILE=`pwd`/.coverage && COV_RCFILE=`pwd`/tests/.coveragerc &&
-          COV_RPT=`report_py_coverage.sh --data-file=$DATA_FILE --coverage-rc-file=$COV_RCFILE` &&
+          COV_RPT=`bash report_py_coverage.sh --data-file=$DATA_FILE --coverage-rc-file=$COV_RCFILE` &&
           echo "::notice title=Coverage Summary::$COV_RPT For details, download 'coverage_results' from Artifacts, extract all files, and open 'index.html'."
       - name: Archive coverage results
         uses: actions/upload-artifact@v4
diff --git a/check_py_coverage.sh b/check_py_coverage.sh
index 30fa7606..2f4e041d 100755
--- a/check_py_coverage.sh
+++ b/check_py_coverage.sh
@@ -73,4 +73,4 @@ coverage combine
 coverage html
 
 # See report_py_coverage.sh file for explanation of script separation
-($SCRIPT_DIR/report_py_coverage.sh --data-file=$COVERAGE_FILE --coverage-rc-file=$COVERAGE_RCFILE)
+(bash $SCRIPT_DIR/report_py_coverage.sh --data-file=$COVERAGE_FILE --coverage-rc-file=$COVERAGE_RCFILE)

From 9df92e46cff99f4f00caa2439cc4717156c75f46 Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Fri, 27 Sep 2024 14:48:03 -0500
Subject: [PATCH 5/9] Edits to coverage reporting structure and created
 directory

---
 .github/workflows/github-actions.yml          |  6 +--
 {tests => coverage_scripts}/.coveragerc       |  0
 coverage_scripts/check_py_coverage.sh         | 34 +++++++++++++++++
 .../initialize_coverage.sh                    | 37 +++----------------
 .../report_py_coverage.sh                     |  9 ++---
 5 files changed, 46 insertions(+), 40 deletions(-)
 rename {tests => coverage_scripts}/.coveragerc (100%)
 create mode 100644 coverage_scripts/check_py_coverage.sh
 rename check_py_coverage.sh => coverage_scripts/initialize_coverage.sh (57%)
 mode change 100755 => 100644
 rename report_py_coverage.sh => coverage_scripts/report_py_coverage.sh (89%)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index a8849831..c121903e 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -21,9 +21,9 @@ jobs:
       # Reducing the frequency of coverage checks may be preferable if this increases.
       # report_py_coverage is being called twice, once within check_py_coverage to print to the terminal and once here to get data for the annotation
       - run: >
-          ./check_py_coverage.sh -j4 &&
-          DATA_FILE=`pwd`/.coverage && COV_RCFILE=`pwd`/tests/.coveragerc &&
-          COV_RPT=`bash report_py_coverage.sh --data-file=$DATA_FILE --coverage-rc-file=$COV_RCFILE` &&
+          ./coverage_scripts/check_py_coverage.sh -j4 &&
+          DATA_FILE=`pwd`/.coverage && COV_RCFILE=`pwd`/coverage_scripts/.coveragerc &&
+          COV_RPT=`bash coverage_scripts/report_py_coverage.sh --data-file=$DATA_FILE --coverage-rc-file=$COV_RCFILE` &&
           echo "::notice title=Coverage Summary::$COV_RPT For details, download 'coverage_results' from Artifacts, extract all files, and open 'index.html'."
       - name: Archive coverage results
         uses: actions/upload-artifact@v4
diff --git a/tests/.coveragerc b/coverage_scripts/.coveragerc
similarity index 100%
rename from tests/.coveragerc
rename to coverage_scripts/.coveragerc
diff --git a/coverage_scripts/check_py_coverage.sh b/coverage_scripts/check_py_coverage.sh
new file mode 100644
index 00000000..109a6059
--- /dev/null
+++ b/coverage_scripts/check_py_coverage.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+SCRIPT_DIRNAME=`dirname $0`
+HERON_DIR=`(cd $SCRIPT_DIRNAME/..; pwd)`
+cd $HERON_DIR
+RAVEN_DIR=`python -c 'from src._utils import get_raven_loc; print(get_raven_loc())'`
+
+bash $HERON_DIR/coverage_scripts/initialize_coverage.sh
+
+#coverage help run
+SRC_DIR=`(cd src && pwd)`
+
+# get display var
+DISPLAY_VAR=`(echo $DISPLAY)`
+# reset it
+export DISPLAY=
+
+export COVERAGE_RCFILE="$SRC_DIR/../coverage_scripts/.coveragerc"
+SOURCE_DIRS=($SRC_DIR,$SRC_DIR/../templates/)
+OMIT_FILES=($SRC_DIR/dispatch/twin_pyomo_test.py,$SRC_DIR/dispatch/twin_pyomo_test_rte.py,$SRC_DIR/dispatch/twin_pyomo_limited_ramp.py,$SRC_DIR/ArmaBypass.py)
+EXTRA="--source=${SOURCE_DIRS[@]} --omit=${OMIT_FILES[@]} --parallel-mode "
+export COVERAGE_FILE=`pwd`/.coverage
+
+coverage erase
+($RAVEN_DIR/run_tests "$@" --re=HERON/tests --python-command="coverage run $EXTRA " || echo run_tests done but some tests failed)
+
+#get DISPLAY BACK
+DISPLAY=$DISPLAY_VAR
+
+## Prepare data and generate the html documents
+coverage combine
+coverage html
+
+# See report_py_coverage.sh file for explanation of script separation
+(bash $HERON_DIR/coverage_scripts/report_py_coverage.sh --data-file=$COVERAGE_FILE --coverage-rc-file=$COVERAGE_RCFILE)
diff --git a/check_py_coverage.sh b/coverage_scripts/initialize_coverage.sh
old mode 100755
new mode 100644
similarity index 57%
rename from check_py_coverage.sh
rename to coverage_scripts/initialize_coverage.sh
index 2f4e041d..30353efc
--- a/check_py_coverage.sh
+++ b/coverage_scripts/initialize_coverage.sh
@@ -1,13 +1,17 @@
 #!/bin/bash
+
+# This script prepares for running commands from the coverage package
+
 SCRIPT_DIRNAME=`dirname $0`
-SCRIPT_DIR=`(cd $SCRIPT_DIRNAME; pwd)`
+HERON_DIR=`(cd $SCRIPT_DIRNAME/..; pwd)`
+echo $HERON_DIR
+cd $HERON_DIR
 RAVEN_DIR=`python -c 'from src._utils import get_raven_loc; print(get_raven_loc())'`
 source $RAVEN_DIR/scripts/establish_conda_env.sh --quiet --load
 RAVEN_LIBS_PATH=`conda env list | awk -v rln="$RAVEN_LIBS_NAME" '$0 ~ rln {print $NF}'`
 BUILD_DIR=${BUILD_DIR:=$RAVEN_LIBS_PATH/build}
 INSTALL_DIR=${INSTALL_DIR:=$RAVEN_LIBS_PATH}
 PYTHON_CMD=${PYTHON_CMD:=python}
-JOBS=${JOBS:=1}
 mkdir -p $BUILD_DIR
 mkdir -p $INSTALL_DIR
 DOWNLOADER='curl -C - -L -O '
@@ -45,32 +49,3 @@ else
 fi
 
 update_python_path
-
-cd $SCRIPT_DIR
-
-#coverage help run
-SRC_DIR=`(cd src && pwd)`
-
-# get display var
-DISPLAY_VAR=`(echo $DISPLAY)`
-# reset it
-export DISPLAY=
-
-export COVERAGE_RCFILE="$SRC_DIR/../tests/.coveragerc"
-SOURCE_DIRS=($SRC_DIR,$SRC_DIR/../templates/)
-OMIT_FILES=($SRC_DIR/dispatch/twin_pyomo_test.py,$SRC_DIR/dispatch/twin_pyomo_test_rte.py,$SRC_DIR/dispatch/twin_pyomo_limited_ramp.py,$SRC_DIR/ArmaBypass.py)
-EXTRA="--source=${SOURCE_DIRS[@]} --omit=${OMIT_FILES[@]} --parallel-mode "
-export COVERAGE_FILE=`pwd`/.coverage
-
-coverage erase
-($RAVEN_DIR/run_tests "$@" --re=HERON/tests --python-command="coverage run $EXTRA " || echo run_tests done but some tests failed)
-
-#get DISPLAY BACK
-DISPLAY=$DISPLAY_VAR
-
-## Prepare data and generate the html documents
-coverage combine
-coverage html
-
-# See report_py_coverage.sh file for explanation of script separation
-(bash $SCRIPT_DIR/report_py_coverage.sh --data-file=$COVERAGE_FILE --coverage-rc-file=$COVERAGE_RCFILE)
diff --git a/report_py_coverage.sh b/coverage_scripts/report_py_coverage.sh
similarity index 89%
rename from report_py_coverage.sh
rename to coverage_scripts/report_py_coverage.sh
index 27514c41..df69bea7 100644
--- a/report_py_coverage.sh
+++ b/coverage_scripts/report_py_coverage.sh
@@ -7,13 +7,10 @@
 #   "coverage report --format=total" directly in the yaml does not work
 
 SCRIPT_DIRNAME=`dirname $0`
-cd $SCRIPT_DIRNAME
+HERON_DIR=`(cd $SCRIPT_DIRNAME/..; pwd)`
+cd $HERON_DIR
 
-if ! which coverage > /dev/null 2>&1
-then
-  echo "Could not find coverage module"
-  exit 1
-fi
+bash coverage_scripts/initialize_coverage.sh
 
 # read command-line arguments
 ARGS=()

From 9c8feba92a617c80de5f9396c9f385d1e3200590 Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Fri, 27 Sep 2024 19:33:30 -0500
Subject: [PATCH 6/9] Fixing bug

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index c121903e..79cd3a6d 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -21,7 +21,7 @@ jobs:
       # Reducing the frequency of coverage checks may be preferable if this increases.
       # report_py_coverage is being called twice, once within check_py_coverage to print to the terminal and once here to get data for the annotation
       - run: >
-          ./coverage_scripts/check_py_coverage.sh -j4 &&
+          bash coverage_scripts/check_py_coverage.sh -j4 &&
           DATA_FILE=`pwd`/.coverage && COV_RCFILE=`pwd`/coverage_scripts/.coveragerc &&
           COV_RPT=`bash coverage_scripts/report_py_coverage.sh --data-file=$DATA_FILE --coverage-rc-file=$COV_RCFILE` &&
           echo "::notice title=Coverage Summary::$COV_RPT For details, download 'coverage_results' from Artifacts, extract all files, and open 'index.html'."

From 1fed821ee01278f8730384c9064b6db75343fcd0 Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Sat, 28 Sep 2024 12:08:31 -0500
Subject: [PATCH 7/9] Additional debugging

---
 coverage_scripts/check_py_coverage.sh   | 2 +-
 coverage_scripts/initialize_coverage.sh | 2 +-
 coverage_scripts/report_py_coverage.sh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coverage_scripts/check_py_coverage.sh b/coverage_scripts/check_py_coverage.sh
index 109a6059..d26c6be7 100644
--- a/coverage_scripts/check_py_coverage.sh
+++ b/coverage_scripts/check_py_coverage.sh
@@ -4,7 +4,7 @@ HERON_DIR=`(cd $SCRIPT_DIRNAME/..; pwd)`
 cd $HERON_DIR
 RAVEN_DIR=`python -c 'from src._utils import get_raven_loc; print(get_raven_loc())'`
 
-bash $HERON_DIR/coverage_scripts/initialize_coverage.sh
+source $HERON_DIR/coverage_scripts/initialize_coverage.sh
 
 #coverage help run
 SRC_DIR=`(cd src && pwd)`
diff --git a/coverage_scripts/initialize_coverage.sh b/coverage_scripts/initialize_coverage.sh
index 30353efc..aa588b64 100644
--- a/coverage_scripts/initialize_coverage.sh
+++ b/coverage_scripts/initialize_coverage.sh
@@ -27,7 +27,7 @@ update_python_path ()
 }
 
 update_python_path
-PATH=$INSTALL_DIR/bin:$PATH
+export PATH=$INSTALL_DIR/bin:$PATH
 
 if which coverage
 then
diff --git a/coverage_scripts/report_py_coverage.sh b/coverage_scripts/report_py_coverage.sh
index df69bea7..a077c078 100644
--- a/coverage_scripts/report_py_coverage.sh
+++ b/coverage_scripts/report_py_coverage.sh
@@ -10,7 +10,7 @@ SCRIPT_DIRNAME=`dirname $0`
 HERON_DIR=`(cd $SCRIPT_DIRNAME/..; pwd)`
 cd $HERON_DIR
 
-bash coverage_scripts/initialize_coverage.sh
+source coverage_scripts/initialize_coverage.sh
 
 # read command-line arguments
 ARGS=()

From f2a5787483b71512e199e36a55bfbbbf3e8d3eee Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Sat, 28 Sep 2024 12:33:01 -0500
Subject: [PATCH 8/9] Taking care of one more bug

---
 coverage_scripts/report_py_coverage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coverage_scripts/report_py_coverage.sh b/coverage_scripts/report_py_coverage.sh
index a077c078..4ba7b65d 100644
--- a/coverage_scripts/report_py_coverage.sh
+++ b/coverage_scripts/report_py_coverage.sh
@@ -10,7 +10,7 @@ SCRIPT_DIRNAME=`dirname $0`
 HERON_DIR=`(cd $SCRIPT_DIRNAME/..; pwd)`
 cd $HERON_DIR
 
-source coverage_scripts/initialize_coverage.sh
+source coverage_scripts/initialize_coverage.sh > /dev/null 2>&1
 
 # read command-line arguments
 ARGS=()

From c543d79d8d883ab26306fbbf864bcd2a749789e5 Mon Sep 17 00:00:00 2001
From: Caleb Sitton <caleb.sitton@inl.gov>
Date: Thu, 3 Oct 2024 12:00:05 -0500
Subject: [PATCH 9/9] Addressing comments

---
 .github/workflows/github-actions.yml  | 2 +-
 coverage_scripts/check_py_coverage.sh | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 79cd3a6d..414c83f7 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -19,9 +19,9 @@ jobs:
       - run: ../raven/run_tests --library-report
       # The overhead time added by checking coverage is currently about 19% for a single run_tests.
       # Reducing the frequency of coverage checks may be preferable if this increases.
+      - run: bash coverage_scripts/check_py_coverage.sh -j4
       # report_py_coverage is being called twice, once within check_py_coverage to print to the terminal and once here to get data for the annotation
       - run: >
-          bash coverage_scripts/check_py_coverage.sh -j4 &&
           DATA_FILE=`pwd`/.coverage && COV_RCFILE=`pwd`/coverage_scripts/.coveragerc &&
           COV_RPT=`bash coverage_scripts/report_py_coverage.sh --data-file=$DATA_FILE --coverage-rc-file=$COV_RCFILE` &&
           echo "::notice title=Coverage Summary::$COV_RPT For details, download 'coverage_results' from Artifacts, extract all files, and open 'index.html'."
diff --git a/coverage_scripts/check_py_coverage.sh b/coverage_scripts/check_py_coverage.sh
index d26c6be7..e7bbdb77 100644
--- a/coverage_scripts/check_py_coverage.sh
+++ b/coverage_scripts/check_py_coverage.sh
@@ -9,11 +9,6 @@ source $HERON_DIR/coverage_scripts/initialize_coverage.sh
 #coverage help run
 SRC_DIR=`(cd src && pwd)`
 
-# get display var
-DISPLAY_VAR=`(echo $DISPLAY)`
-# reset it
-export DISPLAY=
-
 export COVERAGE_RCFILE="$SRC_DIR/../coverage_scripts/.coveragerc"
 SOURCE_DIRS=($SRC_DIR,$SRC_DIR/../templates/)
 OMIT_FILES=($SRC_DIR/dispatch/twin_pyomo_test.py,$SRC_DIR/dispatch/twin_pyomo_test_rte.py,$SRC_DIR/dispatch/twin_pyomo_limited_ramp.py,$SRC_DIR/ArmaBypass.py)
@@ -23,9 +18,6 @@ export COVERAGE_FILE=`pwd`/.coverage
 coverage erase
 ($RAVEN_DIR/run_tests "$@" --re=HERON/tests --python-command="coverage run $EXTRA " || echo run_tests done but some tests failed)
 
-#get DISPLAY BACK
-DISPLAY=$DISPLAY_VAR
-
 ## Prepare data and generate the html documents
 coverage combine
 coverage html