Skip to content

Commit

Permalink
Merge pull request #75 from regro-cf-autotick-bot/0.20.0_hdc5ca7
Browse files Browse the repository at this point in the history
thrift-cpp v0.20.0
  • Loading branch information
xhochy authored Mar 24, 2024
2 parents 0f79b71 + 16bbfa0 commit 9a50f30
Show file tree
Hide file tree
Showing 15 changed files with 89 additions and 47 deletions.
4 changes: 4 additions & 0 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: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

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

20 changes: 0 additions & 20 deletions .ci_support/migrations/boost_cpp_to_libboost.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
libevent:
- 2.1.12
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
libevent:
- 2.1.12
macos_machine:
Expand Down
25 changes: 23 additions & 2 deletions .gitignore

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

11 changes: 7 additions & 4 deletions .scripts/build_steps.sh

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

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

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

15 changes: 11 additions & 4 deletions .scripts/run_osx_build.sh

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

16 changes: 13 additions & 3 deletions .scripts/run_win_build.bat

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

2 changes: 1 addition & 1 deletion README.md

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

4 changes: 2 additions & 2 deletions azure-pipelines.yml

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

5 changes: 3 additions & 2 deletions build-locally.py

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

10 changes: 5 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{% set version = "0.19.0" %}
{% set version = "0.20.0" %}

package:
name: thrift-split
version: {{ version }}

source:
- url: http://archive.apache.org/dist/thrift/{{ version }}/thrift-{{ version }}.tar.gz
sha256: d49c896c2724a78701e05cfccf6cf70b5db312d82a17efe951b441d300ccf275
sha256: b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6
patches:
- patches/0001-windows-fixes.patch # [win]
- patches/0002-Add-boost-throw_exception-implementation.patch # [win]

build:
number: 1
number: 0
run_exports:
- {{ pin_subpackage("libthrift", max_pin="x.x.x") }}
ignore_run_exports_from:
Expand All @@ -38,7 +38,7 @@ requirements:

outputs:
- name: libthrift
script: install.sh # [unix]
script: install.sh # [unix]
script: install.bat # [win]
build:
run_exports:
Expand Down Expand Up @@ -97,7 +97,7 @@ outputs:
- cmake -GNinja %CMAKE_ARGS% . # [win]

- name: thrift-compiler
script: install.sh # [unix]
script: install.sh # [unix]
script: install.bat # [win]
build:
run_exports:
Expand Down

0 comments on commit 9a50f30

Please sign in to comment.