From 665372172294b1b6649ce04f916e7739192d95dc Mon Sep 17 00:00:00 2001 From: Daniel Dunning <39738037+djdunning@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:05:36 -0700 Subject: [PATCH] DEBUG: working through getting all publish tests to match - fierro-dev (cpu) --- .conda/fierro-dev/cpu/meta.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.conda/fierro-dev/cpu/meta.yaml b/.conda/fierro-dev/cpu/meta.yaml index 45f4b4782..f250c92ac 100644 --- a/.conda/fierro-dev/cpu/meta.yaml +++ b/.conda/fierro-dev/cpu/meta.yaml @@ -1,5 +1,6 @@ {% set version = "1.0.0" %} -{% set compiler_version = "10.4.0" %} +{% set linux_compiler_version = "10.4.0" %} +{% set macos_compiler_version = "12" %} package: name: fierro-dev @@ -15,8 +16,10 @@ build: requirements: run: - cmake >=3.17 - - {{ compiler('cxx') }}={{ compiler_version }} - - {{ compiler('c') }}={{ compiler_version }} + - {{ compiler('c') }}={{ linux_compiler_version }} # [linux] + - {{ compiler('c') }}={{ macos_compiler_version }} # [osx] + - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux] + - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx] - {{ compiler('fortran') }} - fierro-trilinos-cpu - mpi