Skip to content

Commit

Permalink
Merge pull request #96 from regro-cf-autotick-bot/rebuild-gcc930-0-1_…
Browse files Browse the repository at this point in the history
…h4f95e5

Rebuild for gcc930
  • Loading branch information
marcelotrevisani authored Oct 17, 2020
2 parents 640f443 + d93b58e commit d4a6b6e
Show file tree
Hide file tree
Showing 17 changed files with 352 additions and 127 deletions.
24 changes: 18 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

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

72 changes: 14 additions & 58 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 @@ -51,5 +51,11 @@ pin_run_as_build:
max_pin: x.x
suitesparse:
- '5.6'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
arpack:
- '3.7'
c_compiler:
- gcc
c_compiler_version:
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
curl:
- '7'
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
docker_image:
- condaforge/linux-anvil-comp7
fftw:
- '3'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
gmp:
- '6'
libblas:
- 3.8 *netlib
libcblas:
- 3.8 *netlib
liblapack:
- 3.8.0 *netlib
mpfr:
- '4'
perl:
- 5.26.2
pin_run_as_build:
arpack:
max_pin: x.x.x
curl:
max_pin: x
fftw:
max_pin: x
gmp:
max_pin: x
mpfr:
max_pin: x
perl:
max_pin: x.x.x
zlib:
max_pin: x.x
suitesparse:
- '5.6'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
zlib:
- '1.2'
7 changes: 0 additions & 7 deletions .ci_support/migrations/arpack37.yaml

This file was deleted.

60 changes: 60 additions & 0 deletions .ci_support/migrations/gcc930.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
migrator_ts: 1602079781

__migrator:
kind:
version
migration_number: 1
build_number: 1
override_cbc_keys:
- fortran_compiler_stub
paused: false

c_compiler_version: # [unix]
- 11 # [osx and arm64]

- 10 # [osx and x86_64]
- 10 # [osx and x86_64]

- 9 # [linux64]
- 9 # [aarch64]
- 9 # [ppc64le]

# we are keeping both versions for a while during the migration
# we need to remove 7/8 when the migration is done
- 7 # [linux64]
- 7 # [aarch64]
- 8 # [ppc64le]

cxx_compiler_version: # [unix]
- 11 # [osx and arm64]

- 10 # [osx and x86_64]
- 10 # [osx and x86_64]

- 9 # [linux64]
- 9 # [aarch64]
- 9 # [ppc64le]

# we are keeping both versions for a while during the migration
# we need to remove 7/8 when the migration is done
- 7 # [linux64]
- 7 # [aarch64]
- 8 # [ppc64le]

fortran_compiler_version: # [unix or win64]
- 11 # [osx and arm64]

- 9 # [osx and x86_64]
- 7 # [osx and x86_64]

- 9 # [linux64]
- 9 # [aarch64]
- 9 # [ppc64le]

# we are keeping both versions for a while during the migration
# we need to remove 7/8 when the migration is done
- 7 # [linux64]
- 7 # [aarch64]
- 8 # [ppc64le]

- 5 # [win64]
23 changes: 0 additions & 23 deletions .ci_support/migrations/pcre21034.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ arpack:
c_compiler:
- clang
c_compiler_version:
- '9'
- '10'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -15,7 +15,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '9'
- '10'
fftw:
- '3'
fortran_compiler:
Expand All @@ -32,8 +32,6 @@ liblapack:
- 3.8.0 *netlib
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
mpfr:
- '4'
perl:
Expand All @@ -55,5 +53,11 @@ pin_run_as_build:
max_pin: x.x
suitesparse:
- '5.6'
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
zlib:
- '1.2'
Loading

0 comments on commit d4a6b6e

Please sign in to comment.