From 93e2a71a96141b3f2519624f2045a60a339b1207 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 14 Jul 2023 11:09:19 -0600 Subject: [PATCH] [skip ci] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 10 ++++------ configs/sites/hercules/packages.yaml | 2 +- spack | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 515eb9a8d..b1f475b64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,9 @@ [submodule "spack"] path = spack - ##url = https://github.com/spack/spack - ##branch = develop - #url = https://github.com/jcsda/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/climbfuji/spack - branch = feature/merge_141_into_jcsda_emc_spack_stack + #url = https://github.com/spack/spack + #branch = develop + url = https://github.com/jcsda/spack + branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/configs/sites/hercules/packages.yaml b/configs/sites/hercules/packages.yaml index f069dd6c5..e29456191 100644 --- a/configs/sites/hercules/packages.yaml +++ b/configs/sites/hercules/packages.yaml @@ -144,7 +144,7 @@ packages: qt: externals: - spec: qt@5.15.8 - prefix: /apps/spack-managed/gcc-12.2.0/qt-5.15.8-gayzhaahclvlybiiykwj2cym4vo33w6x + prefix: /apps/spack-managed/gcc-11.3.1/qt-5.15.8-d47tsna6f5dylcpblkfgw4gpn2cucihd modules: - qt/5.15.8 subversion: diff --git a/spack b/spack index 2744630e8..01d6aa523 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 2744630e8a744d98c2b19d1941b67756e958cf1d +Subproject commit 01d6aa5239a8f46862d0f35a9f3533afdb9151a2