Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ concurrency:
# to avoid over-canceling runs from `main`
# in which case we'd need to access the PR number from somewhere else rather than `github.ref_name`
# to avoid under-canceling runs from PRs
group: ${{ github.workflow }}-${{ github.ref_name }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
Expand All @@ -53,7 +53,7 @@ jobs:
# OS and/or Python version don't make a difference, so we choose ubuntu and 3.10 for performance
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: actions/setup-python@v5
with:
Expand All @@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Run Spell Checker
uses: crate-ci/typos@v1.24.5
Expand All @@ -94,11 +94,14 @@ jobs:
os:
- linux
- win64
- macos
include:
- os: linux
runner-image: ubuntu-24.04
- os: win64
runner-image: windows-2022
- os: macos
runner-image: macos-latest
- python-version: "3.11"
# only generate coverage report for a single python version in the matrix
# to avoid overloading Codecov
Expand Down Expand Up @@ -141,10 +144,10 @@ jobs:
strategy:
fail-fast: false
matrix:
report-variant: ["linux", "win64"]
report-variant: ["linux", "win64", "macos"]
steps:
# the checkout step is needed to have access to codecov.yml
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: actions/download-artifact@v4
with:
Expand All @@ -168,7 +171,7 @@ jobs:
runs-on: ubuntu-latest
needs: [code-formatting, spell-check]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Set up Conda environment
uses: conda-incubator/setup-miniconda@v3
Expand Down Expand Up @@ -203,7 +206,7 @@ jobs:
pylint_output_path: pylint.json
pylint_todo_sentinel: PYLINT-TODO
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
# NOTE: using Conda instead of actions/setup-python in this job is not strictly necessary
# as it doesn't need to run on Windows or use the setup-idaes local action,
# but we do it for consistency with the other jobs
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
concurrency:
# NOTE: the value of `group` should be chosen carefully,
# otherwise we might end up over- or under-canceling workflow runs
group: ${{ github.workflow }}-${{ github.ref_name }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
Expand Down Expand Up @@ -85,15 +85,16 @@ jobs:
_GITHUB_EVENT_ACTION: ${{ github.event.action }}
shell: python {0}
run: |
import json
import json, os
from os import environ as env
def _display_on_run_dashboard(msg):
# workflow warnings are displayed on the workflow run dashboard,
# so we use this as a way to display a short summary of why this workflow is being run
# without having to dig in each job's log output
print(f'::warning ::{msg}')
def _set_output(name, val):
print(f'::set-output name={name}::{val}')
with open(env["GITHUB_OUTPUT"], "a") as f:
f.write(f"{name}={val}\n")
event_name = env["GITHUB_EVENT_NAME"]
event_action = env["_GITHUB_EVENT_ACTION"]
is_pr = 'pull_request' in event_name.lower()
Expand Down Expand Up @@ -130,11 +131,14 @@ jobs:
os:
- linux
- win64
- macos
include:
- os: linux
runner-image: ubuntu-24.04
- os: win64
runner-image: windows-2022
- os: macos
runner-image: macos-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/display-debug-info
Expand Down Expand Up @@ -197,7 +201,6 @@ jobs:

pytest-site-packages:
name: Run tests from site-packages (non-editable) installation (${{ matrix.install-mode }}/${{ matrix.os }})
# NOTE: using ubuntu-latest (20.04) instead of 18.04 results in failures in power_generation/carbon_capture/mea_solvent_system/unit_models/tests/test_column.py
runs-on: ${{ matrix.runner-image }}
needs: [precheck]
if: >-
Expand Down
Loading