Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/add-diagnostics-ui'
Browse files Browse the repository at this point in the history
  • Loading branch information
lbianchi-lbl committed Jun 21, 2024
2 parents bbe6e43 + 18474b8 commit 320368f
Show file tree
Hide file tree
Showing 301 changed files with 45,679 additions and 2,316 deletions.
7 changes: 7 additions & 0 deletions .github/actions/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ runs:
- name: Install using pip (requirements-dev.txt)
if: inputs.variant == 'dev'
shell: bash -l {0}
run: pip install --progress-bar off -r requirements-dev.txt

- name: Install using pip (git+... URL)
if: inputs.variant == 'standard'
shell: bash -l {0}
env:
_pip_install_url: ${{ github.server_url }}/${{ github.repository }}@${{ github.ref }}
run: |
pip install --progress-bar off -r requirements-dev.txt
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
runner-image: ubuntu-20.04
- os: win64
runner-image: windows-2022
steps:
steps:
- uses: IDAES/idaes-ui/.github/actions/install@main
with:
variant: ${{ matrix.install-variant }}
Expand Down Expand Up @@ -114,14 +114,19 @@ jobs:
package.json
package-lock.json
cypress.config.js
- name: Install node packages
run: npm install

- name: Start UI
run: npm run ui & echo "UI Server started"
run: |
python -m idaes_ui.fv.example &
sleep 30
- name: Cypress run
uses: cypress-io/github-action@v5
with:
wait-on-timeout: 20
wait-on-timeout: 50
command: npm run test
browser: chrome
- name: Upload screenshots
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ dmypy.json
# auto generated files
sample_visualization.json
shared_variable.json
*.pickle
saved_flowsheet/

# cypress
screenshots
Loading

0 comments on commit 320368f

Please sign in to comment.