From 5733e9fac43ee11b69e5708b5d67edcb6aa90fcd Mon Sep 17 00:00:00 2001 From: ashley314 Date: Wed, 15 Apr 2026 13:21:28 -0600 Subject: [PATCH 1/2] require ecflow for ewok-env --- configs/sites/tier1/derecho/packages.yaml | 3 +++ configs/sites/tier1/hercules/packages.yaml | 4 ++++ configs/sites/tier1/orion/packages.yaml | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/configs/sites/tier1/derecho/packages.yaml b/configs/sites/tier1/derecho/packages.yaml index a3eb8e4f6..2de33fab5 100644 --- a/configs/sites/tier1/derecho/packages.yaml +++ b/configs/sites/tier1/derecho/packages.yaml @@ -7,6 +7,9 @@ packages: esmf: require: - 'esmf_os=Linux esmf_comm=mpich' + ewok-env: + require: + - '+ecflow' ### All other external packages listed alphabetically autoconf: diff --git a/configs/sites/tier1/hercules/packages.yaml b/configs/sites/tier1/hercules/packages.yaml index 7c438842b..02b193685 100644 --- a/configs/sites/tier1/hercules/packages.yaml +++ b/configs/sites/tier1/hercules/packages.yaml @@ -1,4 +1,8 @@ packages: +### Modification of common packages + ewok-env: + require: + - '+ecflow' # For addressing https://github.com/JCSDA/spack-stack/issues/1355 # Use system zlib instead of spack-built zlib-ng all: diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml index 99675d2a4..959bb755b 100644 --- a/configs/sites/tier1/orion/packages.yaml +++ b/configs/sites/tier1/orion/packages.yaml @@ -1,4 +1,8 @@ packages: +### Modification of common packages + ewok-env: + require: + - '+ecflow' # For addressing https://github.com/JCSDA/spack-stack/issues/1355 # Use system zlib instead of spack-built zlib-ng all: From 17df88d545dd53d28f8af01406de0cd90e304c61 Mon Sep 17 00:00:00 2001 From: Ashley Griffin Date: Wed, 15 Apr 2026 14:14:44 -0600 Subject: [PATCH 2/2] comments Co-authored-by: Dom Heinzeller --- configs/sites/tier1/hercules/packages.yaml | 2 +- configs/sites/tier1/orion/packages.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/sites/tier1/hercules/packages.yaml b/configs/sites/tier1/hercules/packages.yaml index 02b193685..823efda8e 100644 --- a/configs/sites/tier1/hercules/packages.yaml +++ b/configs/sites/tier1/hercules/packages.yaml @@ -1,5 +1,5 @@ packages: -### Modification of common packages +# Modification of common packages ewok-env: require: - '+ecflow' diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml index 959bb755b..f588f1b78 100644 --- a/configs/sites/tier1/orion/packages.yaml +++ b/configs/sites/tier1/orion/packages.yaml @@ -1,5 +1,5 @@ packages: -### Modification of common packages +# Modification of common packages ewok-env: require: - '+ecflow'