From f36d156268e9884e1b05a2e338c5146e13c26d1a Mon Sep 17 00:00:00 2001 From: Jason M Miller Date: Tue, 19 Nov 2024 13:57:22 -0700 Subject: [PATCH 1/3] user-override to be sourced before environment It would seem sourcing the Conda environment before a users environment prevents later `source`-ing attempts. Closes #29103 --- .../env/{99-user-overrides.sh => 89-user-overrides.sh} | 0 apptainer/mpi.def | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename apptainer/files/mpi/.singularity.d/env/{99-user-overrides.sh => 89-user-overrides.sh} (100%) diff --git a/apptainer/files/mpi/.singularity.d/env/99-user-overrides.sh b/apptainer/files/mpi/.singularity.d/env/89-user-overrides.sh similarity index 100% rename from apptainer/files/mpi/.singularity.d/env/99-user-overrides.sh rename to apptainer/files/mpi/.singularity.d/env/89-user-overrides.sh diff --git a/apptainer/mpi.def b/apptainer/mpi.def index 705e2f8f4e40..17ffba5471da 100644 --- a/apptainer/mpi.def +++ b/apptainer/mpi.def @@ -229,4 +229,4 @@ EOF %files {{ MOOSE_DIR }}/apptainer/set_prompt.bash {{ SET_PROMPT_SCRIPT }} {{ FILES_DIR }}/.singularity.d/env/01-fix-exec.sh /.singularity.d/env/01-fix-exec.sh - {{ FILES_DIR }}/.singularity.d/env/99-user-overrides.sh /.singularity.d/env/99-user-overrides.sh + {{ FILES_DIR }}/.singularity.d/env/99-user-overrides.sh /.singularity.d/env/89-user-overrides.sh From 1b8466343de8d245df6ab733f06a3e5a6ac56317 Mon Sep 17 00:00:00 2001 From: Jason M Miller Date: Tue, 19 Nov 2024 14:15:05 -0700 Subject: [PATCH 2/3] And all the bumps... --- apptainer/mpi.def | 2 +- conda/libmesh-vtk/conda_build_config.yaml | 2 +- conda/libmesh-vtk/meta.yaml | 2 +- conda/libmesh/conda_build_config.yaml | 8 ++++---- conda/libmesh/meta.yaml | 2 +- conda/moose-dev/conda_build_config.yaml | 6 +++--- conda/moose-dev/meta.yaml | 2 +- conda/moose/conda_build_config.yaml | 2 +- conda/mpi/meta.yaml | 2 +- conda/peacock/conda_build_config.yaml | 2 +- conda/peacock/meta.yaml | 2 +- conda/petsc/conda_build_config.yaml | 2 +- conda/petsc/meta.yaml | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apptainer/mpi.def b/apptainer/mpi.def index 17ffba5471da..f48427ae3e15 100644 --- a/apptainer/mpi.def +++ b/apptainer/mpi.def @@ -229,4 +229,4 @@ EOF %files {{ MOOSE_DIR }}/apptainer/set_prompt.bash {{ SET_PROMPT_SCRIPT }} {{ FILES_DIR }}/.singularity.d/env/01-fix-exec.sh /.singularity.d/env/01-fix-exec.sh - {{ FILES_DIR }}/.singularity.d/env/99-user-overrides.sh /.singularity.d/env/89-user-overrides.sh + {{ FILES_DIR }}/.singularity.d/env/89-user-overrides.sh /.singularity.d/env/89-user-overrides.sh diff --git a/conda/libmesh-vtk/conda_build_config.yaml b/conda/libmesh-vtk/conda_build_config.yaml index 2a693a1a3bd8..da8c6d486de0 100644 --- a/conda/libmesh-vtk/conda_build_config.yaml +++ b/conda/libmesh-vtk/conda_build_config.yaml @@ -3,7 +3,7 @@ mpi: - openmpi moose_mpi: - - moose-mpi 2024.11.13 + - moose-mpi 2024.11.19 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/libmesh-vtk/meta.yaml b/conda/libmesh-vtk/meta.yaml index 2ebbe1fea49d..61c98cef7b20 100644 --- a/conda/libmesh-vtk/meta.yaml +++ b/conda/libmesh-vtk/meta.yaml @@ -3,7 +3,7 @@ # libmesh/* # # As well as any directions pertaining to modifying those files. -{% set build = 4 %} +{% set build = 5 %} {% set vtk_version = "9.3.0" %} {% set vtk_friendly_version = "9.3" %} {% set sha256 = "fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9" %} diff --git a/conda/libmesh/conda_build_config.yaml b/conda/libmesh/conda_build_config.yaml index d5f6d3c43257..6c075d594eee 100644 --- a/conda/libmesh/conda_build_config.yaml +++ b/conda/libmesh/conda_build_config.yaml @@ -3,12 +3,12 @@ mpi: - openmpi moose_petsc: - - moose-petsc 3.22.1.193.g72c1e49ee3d mpich_0 - - moose-petsc 3.22.1.193.g72c1e49ee3d openmpi_0 + - moose-petsc 3.22.1.193.g72c1e49ee3d mpich_1 + - moose-petsc 3.22.1.193.g72c1e49ee3d openmpi_1 moose_libmesh_vtk: - - moose-libmesh-vtk 9.3.0 mpich_4 - - moose-libmesh-vtk 9.3.0 openmpi_4 + - moose-libmesh-vtk 9.3.0 mpich_5 + - moose-libmesh-vtk 9.3.0 openmpi_5 zip_keys: - mpi diff --git a/conda/libmesh/meta.yaml b/conda/libmesh/meta.yaml index 18f1dd9b886a..feaf4dae3122 100644 --- a/conda/libmesh/meta.yaml +++ b/conda/libmesh/meta.yaml @@ -4,7 +4,7 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 2 %} +{% set build = 3 %} {% set version = "2024.10.17" %} package: diff --git a/conda/moose-dev/conda_build_config.yaml b/conda/moose-dev/conda_build_config.yaml index c03c9d78265d..c85c7ae1a83d 100644 --- a/conda/moose-dev/conda_build_config.yaml +++ b/conda/moose-dev/conda_build_config.yaml @@ -3,8 +3,8 @@ mpi: - openmpi moose_libmesh: - - moose-libmesh 2024.10.17 mpich_2 - - moose-libmesh 2024.10.17 openmpi_2 + - moose-libmesh 2024.10.17 mpich_3 + - moose-libmesh 2024.10.17 openmpi_3 moose_wasp: - moose-wasp 2024.11.13 @@ -13,7 +13,7 @@ moose_tools: - moose-tools 2024.11.13 moose_peacock: - - moose-peacock 2024.11.13 + - moose-peacock 2024.11.19 zip_keys: - mpi diff --git a/conda/moose-dev/meta.yaml b/conda/moose-dev/meta.yaml index 36e1f00ae40c..11999c6e1187 100644 --- a/conda/moose-dev/meta.yaml +++ b/conda/moose-dev/meta.yaml @@ -2,7 +2,7 @@ # REMEMBER TO UPDATE the .yaml files for the following packages: # moose/conda_build_config.yaml # As well as any directions pertaining to modifying those files. -{% set version = "2024.11.15" %} +{% set version = "2024.11.19" %} package: name: moose-dev diff --git a/conda/moose/conda_build_config.yaml b/conda/moose/conda_build_config.yaml index 9e06a1bec6ad..293a0457bacd 100644 --- a/conda/moose/conda_build_config.yaml +++ b/conda/moose/conda_build_config.yaml @@ -3,7 +3,7 @@ mpi: - openmpi moose_dev: - - moose-dev 2024.11.15 + - moose-dev 2024.11.19 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/mpi/meta.yaml b/conda/mpi/meta.yaml index 8d339d5ec3cf..d862abfaafdd 100644 --- a/conda/mpi/meta.yaml +++ b/conda/mpi/meta.yaml @@ -6,7 +6,7 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set version = "2024.11.13" %} +{% set version = "2024.11.19" %} # HDF5 Version {% set hdf5_version = "1.14.2" %} diff --git a/conda/peacock/conda_build_config.yaml b/conda/peacock/conda_build_config.yaml index f40ab82af4cc..a0e22a03bacb 100644 --- a/conda/peacock/conda_build_config.yaml +++ b/conda/peacock/conda_build_config.yaml @@ -3,4 +3,4 @@ mpi: - openmpi moose_mpi: - - moose-mpi 2024.11.13 + - moose-mpi 2024.11.19 diff --git a/conda/peacock/meta.yaml b/conda/peacock/meta.yaml index 7e28600a9d30..26e3a2e853da 100644 --- a/conda/peacock/meta.yaml +++ b/conda/peacock/meta.yaml @@ -3,7 +3,7 @@ # moose-dev/* # # As well as any directions pertaining to modifying those files. -{% set version = "2024.11.13" %} +{% set version = "2024.11.19" %} package: name: moose-peacock diff --git a/conda/petsc/conda_build_config.yaml b/conda/petsc/conda_build_config.yaml index 2a693a1a3bd8..da8c6d486de0 100644 --- a/conda/petsc/conda_build_config.yaml +++ b/conda/petsc/conda_build_config.yaml @@ -3,7 +3,7 @@ mpi: - openmpi moose_mpi: - - moose-mpi 2024.11.13 + - moose-mpi 2024.11.19 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/petsc/meta.yaml b/conda/petsc/meta.yaml index b00124037047..670ac58d09c1 100644 --- a/conda/petsc/meta.yaml +++ b/conda/petsc/meta.yaml @@ -7,7 +7,7 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 0 %} +{% set build = 1 %} {% set version = "3.22.1.193.g72c1e49ee3d" %} package: From 9da02321ab6807556a03ca68d70e1291cb4962bc Mon Sep 17 00:00:00 2001 From: Jason M Miller Date: Thu, 21 Nov 2024 06:38:45 -0700 Subject: [PATCH 3/3] bump hashes --- scripts/tests/versioner_hashes.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/tests/versioner_hashes.yaml b/scripts/tests/versioner_hashes.yaml index f4b115bdcf2e..b1dec4f09c3e 100644 --- a/scripts/tests/versioner_hashes.yaml +++ b/scripts/tests/versioner_hashes.yaml @@ -383,3 +383,10 @@ cece3f711bd9c235af31c9d5a4c54e292400ecc1: #29074 libmesh: eeed62e wasp: 0b6b0db moose-dev: 3b2f25a +1b8466343de8d245df6ab733f06a3e5a6ac56317: #29103 + tools: 2844df4 + mpi: 0675c61 + petsc: 7b3fba4 + libmesh: 21da13a + wasp: 0b6b0db + moose-dev: de3da2d