From 8d647cc6c0ded0ae7466ac71aa5b697b25a5e592 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Thu, 16 Jan 2025 13:47:52 -0600 Subject: [PATCH 1/4] Add mapping to use existing ubuntu2204 version if ubuntu2404 is detected --- idaes/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/idaes/config.py b/idaes/config.py index c784080244..b5bb1362d1 100644 --- a/idaes/config.py +++ b/idaes/config.py @@ -70,6 +70,7 @@ "xubuntu2004": "ubuntu2004", "xubuntu2204": "ubuntu2204", "pop22": "ubuntu2204", + "ubuntu2404": "ubuntu2204", } # Machine map binary_arch_map = { From 396ab154749e2c03ef2f52c2f549afe48ebc876d Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Thu, 16 Jan 2025 13:49:03 -0600 Subject: [PATCH 2/4] Add ubuntu22.04 and ubuntu24.04 to CI job matrix --- .github/workflows/core.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index bbc4546687..ea1ead5145 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -92,9 +92,15 @@ jobs: 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' From 6a2f84cbc7fd1c83bb63ea3c6d718782c6311384 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Thu, 16 Jan 2025 17:43:10 -0600 Subject: [PATCH 3/4] Remove references to ubuntu-20.04 --- .github/workflows/core.yml | 3 --- .github/workflows/integration.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index ea1ead5145..a64bff1d86 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -90,13 +90,10 @@ 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 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index adbc7f989f..4f8230de0d 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -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: >- @@ -224,7 +224,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 From 77be82e9ecca41d13c407d40fab171b62c6a8e01 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Thu, 16 Jan 2025 17:43:30 -0600 Subject: [PATCH 4/4] Apply changes to integration workflow --- .github/workflows/integration.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 4f8230de0d..e14eddb2f9 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -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: @@ -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: