Tweak token ignores in perf log, bump mac version for gha

NREL · Jul 9, 2024 · 2f1ad3c · 2f1ad3c
1 parent 961a897
commit 2f1ad3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
   unit_tests:
     strategy:
       matrix:
-        os: [ windows-latest, macos-11, ubuntu-22.04 ]  # macos-12 is not playing well with Tk
+        os: [ windows-latest, macos-latest, ubuntu-22.04 ]  # macos-12 is not playing well with Tk
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8  # v2

diff --git a/energyplus_regressions/runtests.py b/energyplus_regressions/runtests.py
@@ -501,7 +501,7 @@ def both_files_exist(base_path_a, base_path_b, common_relative_path):
     @staticmethod
     def diff_perf_log(file_a, file_b, diff_file):
         # will do a pretty simple CSV text token comparison, no numeric comparison, and omit some certain patterns
-        tokens_to_skip = [1, 2, 30, 31]
+        tokens_to_skip = [1, 2, 27, 28, 30, 31]
         with io.open(file_a, encoding='utf-8') as f_txt_1:
             txt1 = f_txt_1.readlines()
         with io.open(file_b, encoding='utf-8') as f_txt_2: