Skip to content

Commit

Permalink
Merge pull request #224 from jdblischak/conda-forge-validation
Browse files Browse the repository at this point in the history
Do not perform conda-forge output validation
  • Loading branch information
jdblischak authored Nov 6, 2024
2 parents 17dd249 + 87e7e60 commit 50cadaf
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 57 deletions.
4 changes: 1 addition & 3 deletions .azure-pipelines/azure-pipelines-linux.yml

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

4 changes: 1 addition & 3 deletions .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: 2 additions & 0 deletions .ci_support/linux_64_fmt11spdlog1.14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ spdlog:
- '1.14'
target_platform:
- linux-64
tiledb:
- '2.26'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_64_fmt9spdlog1.11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ spdlog:
- '1.11'
target_platform:
- linux-64
tiledb:
- '2.26'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
fmt:
- '11'
macos_machine:
Expand Down Expand Up @@ -45,6 +45,8 @@ spdlog:
- '1.14'
target_platform:
- osx-64
tiledb:
- '2.26'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
fmt:
- '11'
macos_machine:
Expand Down Expand Up @@ -45,6 +45,8 @@ spdlog:
- '1.14'
target_platform:
- osx-arm64
tiledb:
- '2.26'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/automerge.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/webservices.yml

This file was deleted.

7 changes: 1 addition & 6 deletions .scripts/build_steps.sh

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

2 changes: 0 additions & 2 deletions .scripts/run_docker_build.sh

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

9 changes: 2 additions & 7 deletions .scripts/run_osx_build.sh

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

2 changes: 1 addition & 1 deletion azure-pipelines.yml

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

2 changes: 1 addition & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ github:
tooling_branch_name: main
build_platform:
osx_arm64: osx_64
conda_forge_output_validation: true
conda_forge_output_validation: false
test: native_and_emulated
# build_with_mambabuild: false
upload_on_branch: main
Expand Down

0 comments on commit 50cadaf

Please sign in to comment.