Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

See if existing ubuntu2204 build of idaes-ext work at all on Ubuntu 24.04 #1559

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

See if existing ubuntu2204 build of idaes-ext work at all on Ubuntu 24.04 #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d647cc
Add mapping to use existing ubuntu2204 version if ubuntu2404 is detected
lbianchi-lbl Jan 16, 2025
396ab15
Add ubuntu22.04 and ubuntu24.04 to CI job matrix
lbianchi-lbl Jan 16, 2025
6a2f84c
Remove references to ubuntu-20.04
lbianchi-lbl Jan 16, 2025
77be82e
Apply changes to integration workflow
lbianchi-lbl Jan 16, 2025
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
9 changes: 6 additions & 3 deletions .github/workflows/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,14 @@ jobs:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12']
os:
- linux
- win64
- ubuntu-22
- ubuntu-24
include:
- os: linux
runner-image: ubuntu-20.04
- os: ubuntu-22
runner-image: ubuntu-22.04
- os: ubuntu-24
runner-image: ubuntu-22.04
- os: win64
runner-image: windows-2022
- python-version: '3.11'
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ defaults:
jobs:
precheck:
name: (util) Check if should run
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
# the ">-" YAML syntax will result in a single string without terminating newline
# it is used here to make the relatively complex if clause more readable by adding line breaks
if: >-
Expand Down Expand Up @@ -134,11 +134,14 @@ jobs:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12']
os:
- linux
- win64
- ubuntu-22
- ubuntu-24
include:
- os: linux
runner-image: ubuntu-20.04
- os: ubuntu-22
runner-image: ubuntu-22.04
- os: ubuntu-24
runner-image: ubuntu-22.04
- os: win64
runner-image: windows-2022
steps:
Expand Down Expand Up @@ -172,11 +175,14 @@ jobs:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12']
os:
- linux
- win64
- ubuntu-22
- ubuntu-24
include:
- os: linux
runner-image: ubuntu-20.04
- os: ubuntu-22
runner-image: ubuntu-22.04
- os: ubuntu-24
runner-image: ubuntu-22.04
- os: win64
runner-image: windows-2022
steps:
Expand Down Expand Up @@ -224,7 +230,7 @@ jobs:
- linux
include:
- os: linux
runner-image: ubuntu-20.04
runner-image: ubuntu-22.04
- install-mode: pip-default
pip-install-target: '.'
- install-mode: pip-complete
Expand Down
1 change: 1 addition & 0 deletions idaes/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"xubuntu2004": "ubuntu2004",
"xubuntu2204": "ubuntu2204",
"pop22": "ubuntu2204",
"ubuntu2404": "ubuntu2204",
}
# Machine map
binary_arch_map = {
Expand Down
Loading