From 9a443a6a10759d2dd74c2e570188b1c8c0ab0094 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 10 Jan 2025 08:41:14 -0700 Subject: [PATCH] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e28019a85..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack - branch = bugfix/freetype_zlibapi_depbuildenv + url = https://github.com/jcsda/spack + branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 53c39cad5..dd99fc1e1 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 53c39cad5d87a18fc77b235d99e2224448b77216 +Subproject commit dd99fc1e177cbae412e1753f3a81499df90cee27