Updated macos runner and attempting to fix windows build

pyswmm · Jun 11, 2023 · 40c8b14 · 40c8b14
1 parent b99ef3f
commit 40c8b14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, ubuntu-20.04, macos-10.15]
+        os: [windows-2022, ubuntu-20.04, macos-13.4]
         requirements: [requirements-swmm.txt]
         include:
           - os: windows-2022
@@ -58,9 +58,9 @@ jobs:
                 shell: bash
                 working-directory: ./ci-tools/linux
 
-          - os: macos-10.15
+          - os: macos-13.4
             sys_pkgs: brew install libomp #boost
-            boost_platform_version: 10.15
+            boost_platform_version: 13.4
             boost_toolsit: clang
             build_unit_test: make.zsh -t -g "Xcode"
             build_reg_test: make.zsh -g "Xcode"
@@ -111,19 +111,19 @@ jobs:
       # install boost on mac and linux
       - name: Install required system packages on mac and linux
         run: ${{ matrix.sys_pkgs }}
-        if: ${{ runner.os == 'macOS' }} 
+        if: ${{ runner.os == 'macOS' }}
 
       # boost takes a while to install on windows, so try to cache
       - name: Install boost
-        # if: ${{runner.os == 'Windows'}} 
+        # if: ${{runner.os == 'Windows'}}
         uses: MarkusJx/install-boost@v2.4.4
         id: install-boost
         with:
             # REQUIRED: Specify the required boost version
             # A list of supported versions can be found here:
             # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
             boost_version: 1.81.0
-            link: shared 
+            link: shared
             # OPTIONAL: Specify a custon install location
             # boost_install_dir: C:\some_directory
             # OPTIONAL: Specify a platform version

diff --git a/tests/solver/test_toolkit_hotstart.cpp b/tests/solver/test_toolkit_hotstart.cpp
@@ -13,10 +13,10 @@
 #include <fstream>
 #include <iterator>
 
-#define HOTSTART_SWMM_SAVE_NORMAL "./hotstart/INFILE_Simulation1.hsf"
-#define HOTSTART_API_SAVE_DURING_SIM1 "./hotstart/swmm_api_test_during_Simulation1.hsf"
-#define HOTSTART_API_SAVE_AFTER_SIM1 "./hotstart/swmm_api_test_after_Simulation1.hsf"
-#define HOTSTART_SWMM_SAVE_SIM2 "./hotstart/INFILE_Simulation2.hsf"
+#define HOTSTART_SWMM_SAVE_NORMAL "hotstart/INFILE_Simulation1.hsf"
+#define HOTSTART_API_SAVE_DURING_SIM1 "hotstart/swmm_api_test_during_Simulation1.hsf"
+#define HOTSTART_API_SAVE_AFTER_SIM1 "hotstart/swmm_api_test_after_Simulation1.hsf"
+#define HOTSTART_SWMM_SAVE_SIM2 "hotstart/INFILE_Simulation2.hsf"
 
 #define ERR_NONE 0