add all tests for macos

gem · Jul 31, 2023 · 94ea1b4 · 94ea1b4
1 parent c684f22
commit 94ea1b4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/macos_intel_install.yml b/.github/workflows/macos_intel_install.yml
@@ -9,7 +9,7 @@ name: MacOS Intel install and test
   schedule:
     - cron: "0 1 * * *"
   push:
-    branches: [ test_os ]
+    branches: [macos_test]
 
 jobs:
 
@@ -37,13 +37,6 @@ jobs:
         env: 
           BRANCH: ${{ github.event.inputs.git-ref }}
         run: |
-          #PY_VER=`echo py${{ matrix.python-version }} | tr -d .`
-          #echo $PY_VER
-          #pip3 install -r requirements-$PY_VER-macos.txt
-          #pip3 install -e .\[osgeo\]
-          echo "sqlite3 version"
-          which sqlite3
-          sqlite3 --version
           export PIP_DEFAULT_TIMEOUT=100
           pip3 install -U pip wheel setuptools
           #
@@ -54,15 +47,14 @@ jobs:
           else
             python install.py devel 
           fi
-      - name: Run demos to test installation
+      - name: Run demos and pytest to test installation
         run: |
           source ~/openquake/bin/activate
           pip3 install pytest
           oq --version
           oq dbserver start
-          #pytest -vsx --color=yes ~/work/oq-engine/oq-engine/openquake/hazardlib/tests/gsim/kotha_2020_test.py
-          #pytest -vsx --color=yes /Users/runner/work/oq-engine/oq-engine/openquake/sep
-          #pytest -vs  --color=yes /Users/runner/work/oq-engine/oq-engine/openquake/calculators
+          pytest -vs  --color=yes /Users/runner/work/oq-engine/oq-engine/openquake/
+          sleep 2
           oq engine --run ~/work/oq-engine/oq-engine/demos/risk/ClassicalDamage/job_hazard.ini
           #
           oq engine --run https://downloads.openquake.org/jobs/risk_test.zip

diff --git a/.github/workflows/macos_m1_monterey_install.yml b/.github/workflows/macos_m1_monterey_install.yml
@@ -8,6 +8,8 @@ name: MacOS Monterey M1
         required: true
   schedule:
     - cron: "15 12 * * *"
+  push:
+    branches: [macos_test]
 
 jobs:
 
@@ -74,20 +76,21 @@ jobs:
           else
             $python install.py devel
           fi
-      - name: Run demos to test installation
+      - name: Run demos and pytest to test installation
         run: |
           source ~/openquake/bin/activate
           pip3 install pytest
           oq --version
           oq dbserver start
           sleep 10
           # test for engine
-          #pytest -vsx --color=yes /Users/runner/runner-isolation/actions-runner/_work/oq-engine/oq-engine/openquake/sep
           #
-          #pytest -vsx --color=yes /Users/runner/runner-isolation/actions-runner/_work/oq-engine/oq-engine/openquake/hazardlib/tests/gsim/kotha_2020_test.py
-          #
-          #pytest -vsx --color=yes /Users/runner/runner-isolation/actions-runner/_work/oq-engine/oq-engine/openquake/calculators
+          pytest -vs --color=yes /Users/runner/runner-isolation/actions-runner/_work/oq-engine/oq-engine/openquake/
+          sleep 2
           # Run calcs
+          oq engine --run ~/work/oq-engine/oq-engine/demos/risk/ClassicalDamage/job_hazard.ini
+          sleep 2
+          #
           oq engine --run https://downloads.openquake.org/jobs/risk_test.zip
-          sleep 15
-          oq engine --run /Users/runner/runner-isolation/actions-runner/_work/oq-engine/oq-engine/demos/hazard/AreaSourceClassicalPSHA/job.ini
+          sleep 3
+          oq engine --run "https://github.com/gem/oq-engine/blob/master/openquake/server/tests/data/classical.zip?raw=true"