From adc04e3f75ee1c2396d27bdacd4537ba71b02805 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 31 Jul 2023 11:59:11 -0400 Subject: [PATCH] Update CircleCI to use Orb Default Baselibs and BCs This PR updates the CircleCI config to default to using the Baselibs in the CircleCI orb rather than explicitly specifying the versions. In most cases, this is the "best" way as a change to the orb can fix this for projects without the need for a PR. Note that we keep commented the explicit anchors in case needed. --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c8e938..fdda162 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 -# Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.13.0 -bcs_version: &bcs_version v11.00.0 +# Anchors in case we need to override the defaults from the orb +#baselibs_version: &baselibs_version v7.14.0 +#bcs_version: &bcs_version v11.1.0 orbs: @@ -18,7 +18,7 @@ workflows: matrix: parameters: compiler: [ifort, gfortran] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GEOSgcm checkout_fixture: true mepodevelop: true @@ -30,7 +30,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -42,7 +42,7 @@ workflows: parameters: compiler: [ifort, gfortran] fv_precision: ["R4", "R8"] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GEOSfvdycore checkout_fixture: true mepodevelop: false @@ -55,7 +55,7 @@ workflows: parameters: compiler: [gfortran, ifort] fv_precision: ["R4", "R8"] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version requires: - build-GEOSfvdycore-as-<< matrix.fv_precision >>-on-<< matrix.compiler >> repo: GEOSfvdycore