Merge pull request OpenWaterAnalytics#781 from eladsal/update-build-s…

…cript Update old build script
LRossman · Apr 21, 2024 · 72eeb3d · 72eeb3d
2 parents c34ab39 + 3d7cf9a
commit 72eeb3d
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 36 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -9,27 +9,52 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Setup build directory
-      run: mkdir buildproducts
+      - uses: actions/checkout@v4
 
-    - name: CMake
-      working-directory: ./buildproducts
-      run: cmake ..
+      - name: Setup build directory
+        run: mkdir buildproducts
 
-    - name: Make
-      working-directory: ./buildproducts
-      run: make
+      - name: CMake
+        working-directory: ./buildproducts
+        run: |
+          retry=0
+          max_retries=3
+          until cmake ..; do
+            retry=$((retry+1))
+            echo "Retry $retry/$max_retries..."
+            if [ "$retry" -ge "$max_retries" ]; then
+              echo "CMake configuration failed after $max_retries attempts."
+              exit 1
+            fi
+            sleep 10
+          done
       
-    - name: Copy header files to build directory
-      run: |
-        cp include/epanet2.h buildproducts/
-        cp include/epanet2_2.h buildproducts/
-        cp include/epanet2_enums.h buildproducts/
-        
-    - uses: actions/upload-artifact@v4
-      with:
-        name: libepanet-output
-        path: buildproducts/
+      - name: Make
+        working-directory: ./buildproducts
+        run: |
+          retry=0
+          max_retries=3
+          until make; do
+            retry=$((retry+1))
+            echo "Retry $retry/$max_retries..."
+            if [ "$retry" -ge "$max_retries" ]; then
+              echo "Make build failed after $max_retries attempts."
+              exit 1
+            fi
+            sleep 10
+          done
+      
+      - name: Copy header files to build directory
+        run: |
+          cp include/epanet2.h buildproducts/
+          cp include/epanet2_2.h buildproducts/
+          cp include/epanet2_enums.h buildproducts/
+          
+      - uses: actions/upload-artifact@v4
+        with:
+          name: libepanet-output
+          path: buildproducts/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,26 +9,51 @@ on:
 jobs:
   build:
     runs-on: macos-latest
+    strategy:
+      fail-fast: false
 
     steps:
     - uses: actions/checkout@v4
+
     - name: Setup build directory
       run: mkdir buildproducts
-      
+
     - name: CMake
       working-directory: ./buildproducts
-      run: cmake ..
-
+      run: |
+        retry=0
+        max_retries=3
+        until cmake ..; do
+          ((retry++))
+          echo "Retry $retry/$max_retries..."
+          if [ "$retry" -ge "$max_retries" ]; then
+            echo "CMake configuration failed after $max_retries attempts."
+            exit 1
+          fi
+          sleep 10
+        done
+
     - name: Make
       working-directory: ./buildproducts
-      run: make
-
+      run: |
+        retry=0
+        max_retries=3
+        until make; do
+          ((retry++))
+          echo "Retry $retry/$max_retries..."
+          if [ "$retry" -ge "$max_retries" ]; then
+            echo "Make build failed after $max_retries attempts."
+            exit 1
+          fi
+          sleep 10
+        done
+
     - name: Copy header files to build directory
       run: |
         cp include/epanet2.h buildproducts/
         cp include/epanet2_2.h buildproducts/
         cp include/epanet2_enums.h buildproducts/
-        
+
     - uses: actions/upload-artifact@v4
       with:
         name: libepanet-output

diff --git a/.github/workflows/win32.yml b/.github/workflows/win32.yml
@@ -9,6 +9,8 @@ on:
 jobs:
   build:
     runs-on: windows-latest
+    strategy:
+      fail-fast: false
 
     steps:
       - name: Checkout repository
@@ -19,7 +21,21 @@ jobs:
 
       - name: CMake
         working-directory: ./buildproducts
-        run: cmake .. -A Win32 && cmake --build . --config Release
+        shell: pwsh
+        run: |
+          $retryCount = 0
+          $maxRetries = 3
+          do {
+            cmake .. -A Win32 && cmake --build . --config Release
+            if ($LASTEXITCODE -eq 0) { break }
+            Write-Host "Retry $($retryCount + 1)/$maxRetries..."
+            Start-Sleep -Seconds 10
+            $retryCount++
+          } while ($retryCount -lt $maxRetries)
+          if ($retryCount -eq $maxRetries) {
+            Write-Host "CMake build failed after $maxRetries attempts."
+            exit 1
+          }
 
       - name: Copy header files to build directory
         run: |
@@ -31,4 +47,4 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: epanet2-win32
-          path: buildproducts\bin\Release
+          path: buildproducts\bin\Release
diff --git a/.github/workflows/win64.yml b/.github/workflows/win64.yml
@@ -9,6 +9,8 @@ on:
 jobs:
   build:
     runs-on: windows-latest
+    strategy:
+      fail-fast: false
 
     steps:
       - name: Checkout repository
@@ -19,16 +21,31 @@ jobs:
 
       - name: CMake
         working-directory: ./buildproducts
-        run: cmake .. -A x64 && cmake --build . --config Release
-
+        shell: pwsh
+        run: |
+          $retryCount = 0
+          $maxRetries = 3
+          do {
+            cmake .. -A x64  # Specify architecture for 64-bit
+            cmake --build . --config Release
+            if ($LASTEXITCODE -eq 0) { break }
+            Write-Host "Retry $($retryCount + 1)/$maxRetries..."
+            Start-Sleep -Seconds 10
+            $retryCount++
+          } while ($retryCount -lt $maxRetries)
+          if ($retryCount -eq $maxRetries) {
+            Write-Host "CMake build failed after $maxRetries attempts."
+            exit 1
+          }
+
       - name: Copy header files to build directory
         run: |
           copy include\epanet2.h buildproducts\bin\Release
           copy include\epanet2_2.h buildproducts\bin\Release
           copy include\epanet2_enums.h buildproducts\bin\Release
         shell: cmd
-
+        
       - uses: actions/upload-artifact@v4
         with:
           name: epanet2-win64
-          path: buildproducts\bin\Release
+          path: buildproducts\bin\Release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@
 #   CMake is available at https://cmake.org/download/
 #
 
-cmake_minimum_required (VERSION 2.8.8)
+cmake_minimum_required (VERSION 3.5.2)
 
 project(EPANET)
 

diff --git a/README.md b/README.md
@@ -7,6 +7,8 @@ OWA-EPANET
 [![codecov](https://codecov.io/gh/OpenWaterAnalytics/EPANET/branch/master/graph/badge.svg)](https://codecov.io/gh/OpenWaterAnalytics/EPANET)
 
 [![linux](https://github.com/OpenWaterAnalytics/EPANET/actions/workflows/ccpp.yml/badge.svg)](https://github.com/OpenWaterAnalytics/EPANET/actions/workflows/ccpp.yml)
+[![macos](https://github.com/OpenWaterAnalytics/EPANET/actions/workflows/macos.yml/badge.svg)](https://github.
+com/OpenWaterAnalytics/EPANET/actions/workflows/macos.yml)
 [![epanet2-win32](https://github.com/OpenWaterAnalytics/EPANET/actions/workflows/win32.yml/badge.svg)](https://github.com/OpenWaterAnalytics/EPANET/actions/workflows/win32.yml)
 [![epanet2-win64](https://github.com/OpenWaterAnalytics/EPANET/actions/workflows/win64.yml/badge.svg)](https://github.com/OpenWaterAnalytics/EPANET/actions/workflows/win64.yml)
 

diff --git a/win_build/Makefile.bat b/win_build/Makefile.bat
@@ -23,9 +23,9 @@ Find /i "x86" < checkOS.tmp > StringCheck.tmp
 If %ERRORLEVEL% == 1 (
 	CALL "%SDK_PATH%bin\"SetEnv.cmd /x64 /release
 	rem : create epanet2.dll
-	cl -o epanet2.dll epanet.c epanet2.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /link /DLL
+	cl -o epanet2.dll epanet.c epanet2.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c validate.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /link /DLL
 	rem : create runepanet.exe
-	cl -o runepanet.exe epanet.c epanet2.c ..\run\main.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /I ..\src /link
+	cl -o runepanet.exe epanet.c epanet2.c ..\run\main.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c validate.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /I ..\src /link
 	md "%Build_PATH%"\64bit
 	move /y "%SRC_PATH%"\*.dll "%Build_PATH%"\64bit
 	move /y "%SRC_PATH%"\*.exe "%Build_PATH%"\64bit
@@ -37,9 +37,9 @@ rem : 32 bit with DEF
 CALL "%SDK_PATH%bin\"SetEnv.cmd /x86 /release
 echo "32 bit with epanet2.def mapping"
 rem : create epanet2.dll
-cl -o epanet2.dll epanet.c epanet2.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /link /DLL /def:..\include\epanet2.def /MAP
+cl -o epanet2.dll epanet.c epanet2.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c validate.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /link /DLL /def:..\include\epanet2.def /MAP
 rem : create runepanet.exe
-cl -o runepanet.exe epanet.c epanet2.c ..\run\main.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /I ..\src /link
+cl -o runepanet.exe epanet.c epanet2.c ..\run\main.c hash.c hydraul.c hydcoeffs.c hydstatus.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c project.c quality.c qualroute.c qualreact.c report.c rules.c smatrix.c genmmd.c validate.c /O2 /Depanet2_EXPORTS /I ..\include /I ..\run /I ..\src /link
 md "%Build_PATH%"\32bit
 move /y "%SRC_PATH%"\*.dll "%Build_PATH%"\32bit
 move /y "%SRC_PATH%"\*.exe "%Build_PATH%"\32bit