From 0720d2593d7ec07505c542f2cd4f02905b1008a8 Mon Sep 17 00:00:00 2001 From: Timothy Cera Date: Thu, 17 Oct 2024 02:04:50 -0400 Subject: [PATCH 1/3] Support new process for FORTRAN compiler on Windows. --- recipe/meta.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 01afed9..96fef61 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,19 +14,15 @@ build: requirements: build: - - {{ compiler('fortran') }} # [not win] - - {{ stdlib("c") }} # [not win] - - m2w64-gcc-fortran # [win] + - {{ stdlib("c") }} + - {{ compiler("fortran") }} - cmake - pkg-config >=0.21 - make # [not win] - ninja # [win] host: - llvm-openmp - - m2w64-gcc-fortran # [win] - run: - - m2w64-gcc-libgfortran # [win] - - m2w64-gcc-libs # [win] + run: # intentionally empty test: commands: From 5b13fba403ae3598767f1e315e4d08ed70848660 Mon Sep 17 00:00:00 2001 From: Timothy Cera Date: Thu, 17 Oct 2024 02:08:15 -0400 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.2, and conda-forge-pinning 2024.10.16.14.01.38 --- .ci_support/win_64_.yaml | 6 ++++++ .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- .scripts/run_win_build.bat | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index e717348..8bba4b9 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,6 +1,12 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +fortran_compiler: +- flang +fortran_compiler_version: +- '19' target_platform: - win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469..12647a5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051..dfef5ae 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -88,8 +88,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index a45c34f..c43b3db 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -59,8 +59,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step From 1220cce2fccb5c06e65875778d6c558d07e82e08 Mon Sep 17 00:00:00 2001 From: Timothy Cera Date: Thu, 17 Oct 2024 09:55:36 -0400 Subject: [PATCH 3/3] Bump build number. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 96fef61..562ca54 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: aec475ccb5ccf7c5a758dfb699626f2be78a22729a9d8d5e0a286db6a3213a51 build: - number: 4 + number: 5 requirements: build: