From 07739aa0fdcdfd8f51647afccf5775e4f25fc27d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 6 Jan 2025 12:20:56 -0500 Subject: [PATCH] Move to Ubuntu 24 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4732021e..46320ca4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ parameters: default: "" # Anchors to prevent forgetting to update a version -os_version: &os_version ubuntu20 +os_version: &os_version ubuntu24 baselibs_version: &baselibs_version v8.7.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index eb891d2c..98847b4a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v8.7.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 + image: gmao/ubuntu24-geos-env:v8.7.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests