update CI

LBNL-ETA · Aug 31, 2023 · ec52194 · ec52194
1 parent 2491140
commit ec52194
Showing 1 changed file with 6 additions and 74 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,14 +10,17 @@ on:
   workflow_dispatch:
 
 jobs:
-  test_ubuntu:
-    runs-on: ubuntu-latest
+  build_test:
+    runs-on: ${{ matrix.os }}
+
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.10"]
+        python-version: ["3.8"]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
     - name: Checkout frads
@@ -28,43 +31,6 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Download latest EnergyPlus
-      run: wget https://github.com/taoning/pyenergyplus/releases/download/v23.1.0/pyenergyplus-23.1.0-py3-none-manylinux1_x86_64.whl
-
-    - name: Install EnergyPlus
-      run: pip install pyenergyplus-23.1.0-py3-none-manylinux1_x86_64.whl
-
-    - name: Install frads
-      run: |
-        pip install .
-
-    - name: Run tests
-      run: |
-        pip install pytest
-        pytest test
-
-  test_osx:
-    runs-on: macos-latest
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.10"]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Download latest EnergyPlus
-      run: curl -L "https://github.com/taoning/pyenergyplus/releases/download/v23.1.0/pyenergyplus-23.1.0-py3-none-macosx_10_13_x86_64.whl" -o "pyenergyplus-23.1.0-py3-none-macosx_10_13_x86_64.whl"
-
-    - name: Install EnergyPlus
-      run: pip install pyenergyplus-23.1.0-py3-none-macosx_10_13_x86_64.whl
-
     - name: Install frads
       run: |
         pip install .
@@ -73,37 +39,3 @@ jobs:
       run: |
         pip install pytest
         pytest test
-
-  test_windows: 
-    runs-on: windows-latest
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [3.8, "3.10"]
-    defaults:
-      run:
-        shell: cmd
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Download latest EnergyPlus
-      run: bitsadmin /transfer myDownloadJob /download /priority normal "https://github.com/taoning/pyenergyplus/releases/download/v23.1.0/pyenergyplus-23.1.0-py3-none-win_amd64.whl" "%CD%\pyenergyplus-23.1.0-py3-none-win_amd64.whl"
-
-    - name: Install EnergyPlus
-      run: pip install pyenergyplus-23.1.0-py3-none-win_amd64.whl
-
-    - name: Install frads
-      run: |
-        pip install .
-
-    - name: Run tests
-      run: |
-        pip install pytest
-        pytest