Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

29103 user override forreals #29104

Open
wants to merge 3 commits into
base: next
Choose a base branch
from
Open

29103 user override forreals #29104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f36d156
user-override to be sourced before environment
milljm Nov 19, 2024
1b84663
And all the bumps...
milljm Nov 19, 2024
9da0232
bump hashes
milljm Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...i/.singularity.d/env/99-user-overrides.sh → ...i/.singularity.d/env/89-user-overrides.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion apptainer/mpi.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/89-user-overrides.sh /.singularity.d/env/89-user-overrides.sh
2 changes: 1 addition & 1 deletion conda/libmesh-vtk/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion conda/libmesh-vtk/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
Expand Down
8 changes: 4 additions & 4 deletions conda/libmesh/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/libmesh/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions conda/moose-dev/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/moose-dev/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/moose/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion conda/mpi/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
Expand Down
2 changes: 1 addition & 1 deletion conda/peacock/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ mpi:
- openmpi

moose_mpi:
- moose-mpi 2024.11.13
- moose-mpi 2024.11.19
2 changes: 1 addition & 1 deletion conda/peacock/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/petsc/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion conda/petsc/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions scripts/tests/versioner_hashes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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