Skip to content

Commit

Permalink
Merge pull request #26 from regro-cf-autotick-bot/rebuild-libxcb116-0…
Browse files Browse the repository at this point in the history
…-1_h564416

Rebuild for libxcb 1.16
  • Loading branch information
matthiasdiener authored Jul 4, 2024
2 parents 2db3ab4 + dfff70b commit b50e350
Show file tree
Hide file tree
Showing 20 changed files with 123 additions and 53 deletions.
1 change: 1 addition & 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.

3 changes: 2 additions & 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.

10 changes: 8 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -21,11 +25,13 @@ libjpeg_turbo:
libpng:
- '1.6'
libxcb:
- '1.15'
- '1.16'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
10 changes: 8 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -25,11 +29,13 @@ libjpeg_turbo:
libpng:
- '1.6'
libxcb:
- '1.15'
- '1.16'
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
10 changes: 8 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -21,11 +25,13 @@ libjpeg_turbo:
libpng:
- '1.6'
libxcb:
- '1.15'
- '1.16'
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
7 changes: 0 additions & 7 deletions .ci_support/migrations/libjpeg_turbo3.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions .ci_support/migrations/libxcb115.yaml

This file was deleted.

10 changes: 10 additions & 0 deletions .ci_support/migrations/libxcb116.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
__migrator:
build_number: 1
commit_message: Rebuild for libxcb 1.16
kind: version
migration_number: 1

# TODO: Add to global pinnins once migration completed
libxcb:
- '1.16'
migrator_ts: 1718798196
12 changes: 9 additions & 3 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +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.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +23,7 @@ libjpeg_turbo:
libpng:
- '1.6'
libxcb:
- '1.15'
- '1.16'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand All @@ -26,4 +32,4 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
- '1'
10 changes: 8 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +23,7 @@ libjpeg_turbo:
libpng:
- '1.6'
libxcb:
- '1.15'
- '1.16'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
Expand All @@ -26,4 +32,4 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
c_compiler:
- vs2017
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -11,8 +13,8 @@ libjpeg_turbo:
libpng:
- '1.6'
libxcb:
- '1.15'
- '1.16'
target_platform:
- win-64
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.

25 changes: 23 additions & 2 deletions .gitignore

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

19 changes: 10 additions & 9 deletions .scripts/build_steps.sh

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

6 changes: 6 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.

13 changes: 10 additions & 3 deletions .scripts/run_osx_build.sh

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

9 changes: 7 additions & 2 deletions .scripts/run_win_build.bat

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.

Loading

0 comments on commit b50e350

Please sign in to comment.