Merge pull request #27351 from milljm/27349-add-gfortran

27349 add gfortran
idaholab · Apr 11, 2024 · 374a78f · 374a78f
2 parents 813f514 + 29e0c8a
commit 374a78f
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 15 deletions.
diff --git a/conda/libmesh-vtk/conda_build_config.yaml b/conda/libmesh-vtk/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_mpich:
-  - moose-mpich 4.0.2 build_15
+  - moose-mpich 4.0.2 build_16
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

diff --git 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 = 8 %}
+{% set build = 9 %}
 {% set vtk_version = "9.2.6" %}
 {% set vtk_friendly_version = "9.2" %}
 {% set sha256 = "06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12" %}

diff --git a/conda/libmesh/conda_build_config.yaml b/conda/libmesh/conda_build_config.yaml
@@ -1,8 +1,8 @@
 moose_petsc:
-  - moose-petsc 3.20.3 build_0
+  - moose-petsc 3.20.3 build_1
 
 moose_libmesh_vtk:
-  - moose-libmesh-vtk 9.2.6 build_8
+  - moose-libmesh-vtk 9.2.6 build_9
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

diff --git 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 = 0 %}
+{% set build = 1 %}
 {% set version = "2024.04.03" %}
 {% set vtk_friendly_version = "9.2" %}
 

diff --git a/conda/moose-dev/conda_build_config.yaml b/conda/moose-dev/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_libmesh:
-  - moose-libmesh 2024.04.03 build_0
+  - moose-libmesh 2024.04.03 build_1
 
 moose_wasp:
   - moose-wasp 2024.03.15
@@ -8,4 +8,4 @@ moose_tools:
   - moose-tools 2024.03.07
 
 moose_peacock:
-  - moose-peacock 2023.11.29
+  - moose-peacock 2023.04.11
diff --git a/conda/moose-dev/meta.yaml b/conda/moose-dev/meta.yaml
@@ -6,7 +6,7 @@
 #   framework/doc/packages_config.yml
 #
 # As well as any directions pertaining to modifying those files.
-{% set version = "2024.04.03" %}
+{% set version = "2024.04.11" %}
 
 package:
   name: moose-dev

diff --git a/conda/moose/conda_build_config.yaml b/conda/moose/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_dev:
-  - moose-dev 2024.04.03
+  - moose-dev 2024.04.11
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

diff --git a/conda/mpich/conda_build_config.yaml b/conda/mpich/conda_build_config.yaml
@@ -8,6 +8,9 @@ moose_libgfortran5:
   - libgfortran5 12.3.0 hbd3c1fe_1                          # [not arm64 and osx]
   - libgfortran5 12.3.0 ha3a6a3e_1                          # [arm64]
 
+moose_gcc:                                                  # [linux]
+  - gcc 10.4.0                                              # [linux]
+
 moose_ld64:                                                 # [osx]
   - ld64 609                                                # [not arm64 and osx]
   - ld64_osx-arm64 609                                      # [arm64]

diff --git a/conda/mpich/meta.yaml b/conda/mpich/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 build = 15 %}
+{% set build = 16 %}
 {% set version = "4.0.2" %}
 
 # permanent
@@ -43,6 +43,8 @@ requirements:
     - {{ moose_libclang13 }}
     - {{ moose_clangcc }}       # [osx]
     - {{ moose_clangxx }}       # [osx]
+    - {{ moose_gcc }}           # [linux]
+    - gfortran
   host:
     # TODO: Try to remove when this version settles down among other conda-forge packages
     - openssl <3.2.0a           # [osx]
@@ -70,6 +72,9 @@ requirements:
     - {{ moose_xorg_x11 }}      # [linux]
     - {{ moose_libglu }}        # [linux]
     - {{ moose_mesalib }}       # [linux]
+    - {{ moose_gcc }}           # [linux]
+    - gxx                       # [linux]
+    - gfortran
     - cmake
     - make
     - libtool

diff --git a/conda/peacock/conda_build_config.yaml b/conda/peacock/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_mpich:
-  - moose-mpich 4.0.2 build_15
+  - moose-mpich 4.0.2 build_16
 
 # Pesky packages that break internal CI
 # Note: Modifying/Updating this will require changes to conda/mpich!

diff --git 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 = "2023.11.29" %}
+{% set version = "2023.04.11" %}
 
 package:
   name: moose-peacock

diff --git a/conda/petsc/conda_build_config.yaml b/conda/petsc/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_mpich:
-  - moose-mpich 4.0.2 build_15
+  - moose-mpich 4.0.2 build_16
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

diff --git 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.20.3" %}
 
 # permanent

diff --git a/framework/doc/packages_config.yml b/framework/doc/packages_config.yml
@@ -6,7 +6,7 @@ minimum_python: 3.7
 mpich: 4.0.2
 petsc_alt: 3.11.4
 petsc: 3.20.3
-moose_dev: 2024.04.03
+moose_dev: 2024.04.11
 moose_tools: 2024.03.07
 apptainer_rockylinux: 8.8.20230518
 apptainer_mpich: 3.4.3

diff --git a/scripts/tests/versioner_hashes.yaml b/scripts/tests/versioner_hashes.yaml
@@ -231,3 +231,9 @@ f3b536ee45195b67bc172179b49394d8d2ab986d: #27273
   libmesh: b2f920f
   moose-dev: 0d99cb2
   wasp: 170dd08
+cd156d7fc3c253b266689e1a8ac2ce5c18e8b5af: #27349
+  mpich: ac30c0c
+  petsc: 6a35350
+  libmesh: 7142db2
+  moose-dev: 8d35086
+  wasp: 170dd08