From 77dcbd636bfaf5e7b27e86b7a634f96314e417db Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 23 Aug 2024 14:44:31 -0400 Subject: [PATCH] Update to v4 orb --- .circleci/config.yml | 10 +++++----- .github/workflows/workflow.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 19f37a05..47851170 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,11 +17,11 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 baselibs_version: &baselibs_version v7.25.0 -bcs_version: &bcs_version v11.5.0 +bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name gcmversion orbs: - ci: geos-esm/circleci-tools@2 + ci: geos-esm/circleci-tools@4 workflows: build-test: @@ -75,7 +75,7 @@ workflows: filters: tags: only: /^v.*$/ - name: publish-intel-docker-image + name: publish-ifort-docker-image context: - docker-hub-creds - ghcr-creds @@ -85,8 +85,8 @@ workflows: container_name: geosgcm mpi_name: intelmpi mpi_version: "2021.13" - compiler_name: intel - compiler_version: "2024.2" + compiler_name: ifort + compiler_version: "2021.13" image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ac458673..7d148d7f 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:v7.25.0-intelmpi_2021.13-intel_2024.2 + image: gmao/ubuntu20-geos-env:v7.25.0-intelmpi_2021.13-ifort_2021.13 # 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