Skip to content

Commit

Permalink
Merge pull request #149 from h-vetinari/boost
Browse files Browse the repository at this point in the history
Migrate libboost 1.82
  • Loading branch information
xhochy authored Sep 29, 2023
2 parents d00c3ad + c73890f commit 12cbf4e
Show file tree
Hide file tree
Showing 14 changed files with 174 additions and 152 deletions.
56 changes: 8 additions & 48 deletions .azure-pipelines/azure-pipelines-win.yml

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

11 changes: 2 additions & 9 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
boost:
- 1.78.0
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
Expand Down Expand Up @@ -38,15 +34,12 @@ libpng:
- '1.6'
libtiff:
- '4.6'
nspr:
- '4'
nss:
- '3'
openjpeg:
- '2'
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
qt_main:
- '5.15'
target_platform:
Expand Down
11 changes: 2 additions & 9 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
boost:
- 1.78.0
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
Expand Down Expand Up @@ -42,15 +38,12 @@ libpng:
- '1.6'
libtiff:
- '4.6'
nspr:
- '4'
nss:
- '3'
openjpeg:
- '2'
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
qt_main:
- '5.15'
target_platform:
Expand Down
11 changes: 2 additions & 9 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
boost:
- 1.78.0
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
Expand Down Expand Up @@ -38,15 +34,12 @@ libpng:
- '1.6'
libtiff:
- '4.6'
nspr:
- '4'
nss:
- '3'
openjpeg:
- '2'
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
20 changes: 20 additions & 0 deletions .ci_support/migrations/boost_cpp_to_libboost.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
migrator_ts: 1695775149
__migrator:
kind: version
migration_number: 1
bump_number: 1
commit_message: "Rebuild for libboost 1.82"
# limit the number of prs for ramp-up
pr_limit: 10
libboost_devel:
- 1.82
# This migration is matched with a piggy-back migrator
# (see https://github.com/regro/cf-scripts/pull/1668)
# that will replace boost-cpp with libboost-devel
boost_cpp:
- 1.82
# same for boost -> libboost-python-devel
libboost_python_devel:
- 1.82
boost:
- 1.82
15 changes: 0 additions & 15 deletions .ci_support/migrations/jpeg_to_libjpeg_turbo.yaml

This file was deleted.

11 changes: 2 additions & 9 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost:
- 1.78.0
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand Down Expand Up @@ -38,15 +34,12 @@ libtiff:
- '4.6'
macos_machine:
- x86_64-apple-darwin13.4.0
nspr:
- '4'
nss:
- '3'
openjpeg:
- '2'
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
qt_main:
- '5.15'
target_platform:
Expand Down
11 changes: 2 additions & 9 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
boost:
- 1.78.0
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
Expand Down Expand Up @@ -38,15 +34,12 @@ libtiff:
- '4.6'
macos_machine:
- arm64-apple-darwin20.0.0
nspr:
- '4'
nss:
- '3'
openjpeg:
- '2'
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
target_platform:
- osx-arm64
zip_keys:
Expand Down
9 changes: 0 additions & 9 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
boost:
- 1.78.0
boost_cpp:
- 1.78.0
c_compiler:
- vs2019
cairo:
Expand Down Expand Up @@ -32,11 +28,6 @@ libtiff:
- '4.6'
openjpeg:
- '2'
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
qt_main:
- '5.15'
target_platform:
Expand Down
9 changes: 4 additions & 5 deletions .scripts/build_steps.sh

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

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

8 changes: 4 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.

Loading

0 comments on commit 12cbf4e

Please sign in to comment.