Skip to content

Commit

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

Rebuild for pcre2 10.44
  • Loading branch information
AntoinePrv authored Jun 17, 2024
2 parents a4c9953 + ea31e7a commit ae4c8f5
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ipopt:
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
- '1.84'
mpfr:
- '4'
target_platform:
Expand All @@ -43,4 +43,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
8 changes: 0 additions & 8 deletions .ci_support/migrations/pcre21043.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .ci_support/migrations/pcre21044.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for pcre2 10.44
kind: version
migration_number: 1
migrator_ts: 1718477081.800498
pcre2:
- '10.44'
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ipopt:
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
- '1.84'
macos_machine:
- x86_64-apple-darwin13.4.0
mpfr:
Expand All @@ -43,4 +43,4 @@ zip_keys:
- cxx_compiler_version
- fortran_compiler_version
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down Expand Up @@ -27,7 +29,7 @@ ipopt:
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
- '1.84'
macos_machine:
- arm64-apple-darwin20.0.0
mpfr:
Expand All @@ -41,4 +43,4 @@ zip_keys:
- cxx_compiler_version
- fortran_compiler_version
zlib:
- '1.2'
- '1'
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ libblas:
mpfr:
- '4'
pcre2:
- '10.43'
- '10.44'
target_platform:
- win-64
tbb_devel:
- '2021'
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.

7 changes: 7 additions & 0 deletions .scripts/build_steps.sh

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

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh

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

5 changes: 5 additions & 0 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 recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ source:
- 0002-Require-PCRE-on-WIN32.patch

build:
number: 0
number: 1

requirements:
build:
Expand Down

0 comments on commit ae4c8f5

Please sign in to comment.