From 91dbaa3f148eb53511100f4ad4d8c20a56b83e6c Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 12 Dec 2023 10:05:42 -0700 Subject: [PATCH] Revert "test a different way of installing python" This reverts commit caf33c66a9b76669fc817e186c7e7d006f58bbd6. --- .github/workflows/nightly_ci_build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly_ci_build.yml b/.github/workflows/nightly_ci_build.yml index 968d2770..19ed4875 100644 --- a/.github/workflows/nightly_ci_build.yml +++ b/.github/workflows/nightly_ci_build.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: # os: container operations in GHA only work on Ubuntu - simulation-type: [electric] # basic, GEB, residential, + simulation-type: [basic, GEB, residential, electric] # python-version: No need to test more than 1 python-version # runs-on: ${{ matrix.os }} runs-on: ubuntu-latest @@ -46,6 +46,10 @@ jobs: ruby --version bundle update bundle exec certified-update + - name: Install Python dependencies + # Only the electric tests need to install python dependencies + if: ${{ matrix.simulation-type == 'electric' }} + run: bundle exec uo install_python - name: Test project setup # We only need to run these tests once, not every matrix iteration. if: ${{ matrix.simulation-type == 'electric' }} @@ -56,9 +60,7 @@ jobs: bundle exec rspec -e 'Update project directory' bundle exec rspec -e 'Install python dependencies' - name: Test simulations - run: | - bundle exec uo install_python - bundle exec rspec -e 'Run and work with a small ${{ matrix.simulation-type }} simulation' + run: bundle exec rspec -e 'Run and work with a small ${{ matrix.simulation-type }} simulation' - name: Upload artifacts # Save results for examination - useful for debugging uses: actions/upload-artifact@v3