Skip to content

Commit

Permalink
Merge pull request #193 from regro-cf-autotick-bot/5.2.6_h2954a1
Browse files Browse the repository at this point in the history
nco v5.2.6
  • Loading branch information
ocefpaf authored Jun 21, 2024
2 parents b29881d + d4ff882 commit 5533101
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
7 changes: 0 additions & 7 deletions .ci_support/migrations/krb5121.yaml

This file was deleted.

8 changes: 5 additions & 3 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -40,4 +42,4 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
- '1'
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down Expand Up @@ -40,4 +42,4 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ target_platform:
vc:
- '14'
zlib:
- '1.2'
- '1'
4 changes: 2 additions & 2 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "5.2.4" %}
{% set version = "5.2.6" %}
{% set build = 0 %}

package:
Expand All @@ -7,7 +7,7 @@ package:

source:
url: https://github.com/nco/nco/archive/{{ version }}.tar.gz
sha256: 44efa9151825487fa0562fa5c6d68837624059a8e2da9d15c83ceb4d498f7902
sha256: 31245c56c031eee14e32d77b56fcc291785e407ed9534a62c2f1f8320eb317af

build:
number: {{ build }}
Expand All @@ -19,6 +19,7 @@ requirements:
- make # [unix]
- gnuconfig # [unix]
- {{ compiler('c') }}
- {{ stdlib("c") }}
- {{ compiler('cxx') }}
- llvm-openmp # [osx]
- libgomp # [linux]
Expand Down

0 comments on commit 5533101

Please sign in to comment.