Skip to content

Commit

Permalink
Merge pull request #6 from h-vetinari/bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@beckermr
beckermr authored Mar 25, 2024
2 parents be7b7ea + 6a0ee30 commit 572df4a
Show file tree
Hide file tree
Showing 17 changed files with 150 additions and 48 deletions.
10 changes: 10 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file

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

7 changes: 2 additions & 5 deletions .ci_support/osx_64_c_compiler_version11cxx_compiler_version11.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -14,11 +12,10 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python_impl:
- cpython
target_platform:
Expand Down
7 changes: 2 additions & 5 deletions .ci_support/osx_64_c_compiler_version12cxx_compiler_version12.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -14,11 +12,10 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '12'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python_impl:
- cpython
target_platform:
Expand Down
7 changes: 2 additions & 5 deletions .ci_support/osx_64_c_compiler_version13cxx_compiler_version13.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -14,11 +12,10 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python_impl:
- cpython
target_platform:
Expand Down
7 changes: 2 additions & 5 deletions .ci_support/osx_64_c_compiler_version14cxx_compiler_version14.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -14,11 +12,10 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python_impl:
- cpython
target_platform:
Expand Down
7 changes: 2 additions & 5 deletions .ci_support/osx_64_c_compiler_version15cxx_compiler_version15.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -14,11 +12,10 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python_impl:
- cpython
target_platform:
Expand Down
7 changes: 2 additions & 5 deletions .ci_support/osx_64_c_compiler_version16cxx_compiler_version16.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -14,11 +12,10 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python_impl:
- cpython
target_platform:
Expand Down
25 changes: 25 additions & 0 deletions .ci_support/osx_64_c_compiler_version17cxx_compiler_version17.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '17'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
25 changes: 25 additions & 0 deletions .ci_support/osx_64_c_compiler_version18cxx_compiler_version18.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '18'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file

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

25 changes: 23 additions & 2 deletions .gitignore
View file

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh
View file

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

19 changes: 13 additions & 6 deletions .scripts/run_osx_build.sh
View file

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

17 changes: 16 additions & 1 deletion README.md
View file

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
View file

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

16 changes: 16 additions & 0 deletions recipe/conda_build_config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
# clang version; to test new libcxx against old clang
# we need to build libcxx-testing for several versions.
c_compiler_version: # [osx]
- 18 # [osx]
- 17 # [osx]
- 16 # [osx]
- 15 # [osx]
- 14 # [osx]
- 13 # [osx]
- 12 # [osx]
- 11 # [osx]
cxx_compiler_version: # [osx]
- 18 # [osx]
- 17 # [osx]
- 16 # [osx]
- 15 # [osx]
- 14 # [osx]
Expand All @@ -24,3 +28,15 @@ fortran_compiler_version: # [osx]
- 12 # [osx]
- 12 # [osx]
- 12 # [osx]
- 12 # [osx]
- 12 # [osx]
# same for c_stdlib_version
c_stdlib_version: # [osx]
- 10.9 # [osx]
- 10.9 # [osx]
- 10.9 # [osx]
- 10.9 # [osx]
- 10.9 # [osx]
- 10.9 # [osx]
- 10.9 # [osx]
- 10.9 # [osx]
Loading

1 comment on commit 572df4a

@conda-forge-webservices
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

  • @h-vetinari was added to this feedstock maintenance team.

You should get push access to this feedstock and CI services.

Your package won't be available for installation locally until it is built
and synced to the anaconda.org CDN (takes 1-2 hours after the build finishes).

Feel free to join the community Element channel.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details on this are here.

Please sign in to comment.