Skip to content

Commit

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

Rebuild for pcre2_1036
  • Loading branch information
xhochy authored Mar 5, 2021
2 parents d4a6b6e + 49145d8 commit b7d2245
Show file tree
Hide file tree
Showing 15 changed files with 113 additions and 248 deletions.
10 changes: 3 additions & 7 deletions .azure-pipelines/azure-pipelines-linux.yml

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

7 changes: 2 additions & 5 deletions .azure-pipelines/azure-pipelines-osx.yml

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

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ c_compiler:
- gcc
c_compiler_version:
- '9'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -15,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '9'
docker_image:
- condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-comp7
fftw:
- '3'
fortran_compiler:
Expand All @@ -29,7 +31,7 @@ libblas:
libcblas:
- 3.8 *netlib
liblapack:
- 3.8.0 *netlib
- 3.8 *netlib
mpfr:
- '4'
perl:
Expand Down Expand Up @@ -57,5 +59,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'

This file was deleted.

60 changes: 0 additions & 60 deletions .ci_support/migrations/gcc930.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions .ci_support/migrations/pcre2_1036.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
migrator_ts: 1614603878
__migrator:
kind:
version
migration_number:
1
bump_number:
1

pcre2:
- '10.36'

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ arpack:
c_compiler:
- clang
c_compiler_version:
- '10'
- '11'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -15,7 +15,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '10'
- '11'
fftw:
- '3'
fortran_compiler:
Expand All @@ -29,7 +29,7 @@ libblas:
libcblas:
- 3.8 *netlib
liblapack:
- 3.8.0 *netlib
- 3.8 *netlib
macos_machine:
- x86_64-apple-darwin13.4.0
mpfr:
Expand Down
63 changes: 0 additions & 63 deletions .ci_support/osx_64_fortran_compiler_version7.yaml

This file was deleted.

22 changes: 19 additions & 3 deletions .scripts/build_steps.sh

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

30 changes: 30 additions & 0 deletions .scripts/logging_utils.sh

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

Loading

0 comments on commit b7d2245

Please sign in to comment.