Merge pull request #115 from JustinBonus/master

![IMPORTANT] Reclaim green check-mark
NHERI-SimCenter · Sep 30, 2024 · c4cf8ed · c4cf8ed
2 parents cef997b + 592480e
commit c4cf8ed
Showing 1 changed file with 34 additions and 21 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,9 @@
-version: 1.0.{build}
+version: 4.0.{build}
 
 image:
   - macOS
-  - Ubuntu1804
   - Visual Studio 2019
+  - Ubuntu1804
 
 stack: python 3.8
 
@@ -18,17 +18,21 @@ for:
 
     init:
        - export PATH="$HOME/Qt/5.15.2/clang_64/bin:$HOME/venv3.9/bin:$PATH"
-       - python -m pip install --upgrade pip
+       - python3 -m pip install --upgrade pip
        - pip install conan==1.60.1
        - conan user
        - conan remote add simcenter https://nherisimcenter.jfrog.io/artifactory/api/conan/simcenter
 
     install:
        - uname
-       - git clone https://github.com/NHERI-SimCenter/SimCenterBackendApplications.git       
-       - git clone https://github.com/NHERI-SimCenter/SimCenterCommon.git
-       - git clone https://github.com/NHERI-SimCenter/EE-UQ.git
-       - git clone https://github.com/NHERI-SimCenter/QS3hark.git
+       - rm -rf EE-UQ
+       - rm -rf QS3hark
+       - rm -rf SimCenterBackendApplications
+       - rm -rf SimCenterCommon
+       - git clone https://github.com/JustinBonus/SimCenterBackendApplications.git       
+       - git clone https://github.com/JustinBonus/SimCenterCommon.git
+       - git clone https://github.com/JustinBonus/EE-UQ.git
+       - git clone https://github.com/JustinBonus/QS3hark.git
 
     build_script:
 
@@ -48,6 +52,7 @@ for:
        - qmake --version
        - gcc --version
        - python --version
+       - python3 --version
 
   # Ubuntu1804 
   -
@@ -63,17 +68,21 @@ for:
 
     install:
        - uname
+       - rm -rf EE-UQ
+       - rm -rf QS3hark
+       - rm -rf SimCenterBackendApplications
+       - rm -rf SimCenterCommon
        - sudo update-alternatives --set gcc /usr/bin/gcc-9
        - sudo apt-get update
        - sudo apt-get -y install libglu1-mesa-dev freeglut3-dev mesa-common-dev libblas-dev liblapack-dev
-       - python -m pip install --upgrade pip
-       - pip install conan
+       - python3 -m pip install --upgrade pip
+       - pip install conan==1.60.1
        - conan user
        - conan remote add simcenter https://nherisimcenter.jfrog.io/artifactory/api/conan/simcenter
-       - git clone https://github.com/NHERI-SimCenter/SimCenterBackendApplications.git
-       - git clone https://github.com/NHERI-SimCenter/SimCenterCommon.git
-       - git clone https://github.com/NHERI-SimCenter/EE-UQ.git
-       - git clone https://github.com/NHERI-SimCenter/QS3hark.git              
+       - git clone https://github.com/JustinBonus/SimCenterBackendApplications.git
+       - git clone https://github.com/JustinBonus/SimCenterCommon.git
+       - git clone https://github.com/JustinBonus/EE-UQ.git
+       - git clone https://github.com/JustinBonus/QS3hark.git              
 
     build_script:
        # build SimCenterBackendApplications
@@ -93,10 +102,10 @@ for:
        - qmake --version
        - gcc --version
        - python --version
+       - python3 --version
 
   # Visual Studio 2019
   -
-
     matrix:
       only:
         - image: Visual Studio 2019
@@ -109,7 +118,7 @@ for:
        - cmd: set QT=C:\Qt\5.15.2\msvc2019_64\bin
        - cmd: set PATH=%PYTHON%;%PYTHON%\Scripts;%QT%;%PATH%
        - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-       - cmd: pip.exe install conan
+       - cmd: pip.exe install conan==1.60.1
        - cmd: conan user
        - cmd: conan profile new default --detect
        - cmd: conan profile show default
@@ -119,10 +128,14 @@ for:
        - cmd: echo %PATH%
 
     install:
-       - cmd: git clone https://github.com/NHERI-SimCenter/SimCenterBackendApplications.git
-       - git clone https://github.com/NHERI-SimCenter/SimCenterCommon.git
-       - git clone https://github.com/NHERI-SimCenter/EE-UQ.git
-       - git clone https://github.com/NHERI-SimCenter/QS3hark.git
+       - cmd: rm -rf EE-UQ
+       - cmd: rm -rf QS3hark
+       - cmd: rm -rf SimCenterBackendApplications
+       - cmd: rm -rf SimCenterCommon
+       - cmd: git clone https://github.com/JustinBonus/SimCenterBackendApplications.git
+       - cmd: git clone https://github.com/JustinBonus/SimCenterCommon.git
+       - cmd: git clone https://github.com/JustinBonus/EE-UQ.git
+       - cmd: git clone https://github.com/JustinBonus/QS3hark.git
        - cmd: dir
 
     build_script:
@@ -132,7 +145,7 @@ for:
       - cmd: mkdir build
       - cmd: cd build
       - cmd: conan install .. --build missing
-      - cmd: cmake .. -G "Visual Studio 16 2019"
+      - cmd: cmake -DCMAKE_CXX_STANDARD=17-DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF .. -G "Visual Studio 16 2019"
       - cmd: cmake --build . --config Release
       - cmd: cmake --install .
       - cmd: cd ..
@@ -153,4 +166,4 @@ for:
       - cmd: cd ..      
 
     test_script:
-      -cmd: python --version
+      - cmd: python --version