From 90a8274a7ede326d8d97b1707dabff69062969d5 Mon Sep 17 00:00:00 2001 From: Alexander Hrabski Date: Wed, 27 May 2026 07:34:12 -0600 Subject: [PATCH 1/3] switch submodule to fork for testing --- .gitmodules | 4 ++-- spack | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..37cf7b798 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + url = https://github.com/AlexanderHrabski-NOAA/spack + branch = update-spack-from-develop [submodule "repos/builtin"] path = repos/builtin url = https://github.com/jcsda/spack-packages diff --git a/spack b/spack index 324bf79a3..6fb75bd0c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 324bf79a31704dbc68fafc9e4a053aa4c60019ea +Subproject commit 6fb75bd0c607b5148c3a126301bc7a9e13b86b26 From 4d28b12782d9a4b8139a5b99da099571bcc76b31 Mon Sep 17 00:00:00 2001 From: Alex Hrabski Date: Mon, 1 Jun 2026 15:53:05 -0600 Subject: [PATCH 2/3] +gui variant of cube no longer exists. GUI is built by default --- .../spack_repo/spack_stack/packages/dev_utils_env/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py index 2e3911b54..0231146ea 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py @@ -31,7 +31,7 @@ class DevUtilsEnv(BundlePackage): # Scalasca/ScoreP depends_on("scalasca", when="+scalasca", type="run") - depends_on("cube +gui", when="+scalasca", type="run") + depends_on("cube", when="+scalasca", type="run") # Miscellaneous depends_on("cloc", type="run") From c37c45f35d84284065fa1bc89d0435e889303693 Mon Sep 17 00:00:00 2001 From: Alex Hrabski Date: Mon, 1 Jun 2026 16:05:21 -0600 Subject: [PATCH 3/3] test with spack-packages after merging from upsteam develop --- .gitmodules | 4 ++-- repos/builtin | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 37cf7b798..bb494fd4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,5 @@ branch = update-spack-from-develop [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + url = https://github.com/AlexanderHrabski-NOAA/spack-packages + branch = update-spack-packages-from-develop diff --git a/repos/builtin b/repos/builtin index e654f6175..2c97160a3 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit e654f6175b9ec23578d9d71d76696c188c5f5e82 +Subproject commit 2c97160a353851b7ba82cc40394f9f228a304910