Skip to content

Commit

Permalink
Merge pull request #5 from hadim/pinjava
Browse files Browse the repository at this point in the history
Pin Java version + add support for Java 9, 10, 11
  • Loading branch information
CJ-Wright authored Dec 1, 2018
2 parents e3717e1 + e80bb80 commit 680b7f4
Show file tree
Hide file tree
Showing 48 changed files with 1,191 additions and 26 deletions.
22 changes: 20 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,28 @@ environment:
secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1

matrix:
- CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6
- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk10python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7
- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk10python3.7
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk11python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk11python3.7
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk8python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk8python3.7
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk9python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015openjdk9python3.7
CONDA_INSTALL_LOCN: C:\Miniconda36-x64


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '0'
c_compiler:
- gcc
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '10'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '0'
c_compiler:
- gcc
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '10'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '0'
c_compiler:
- gcc
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '11'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '0'
c_compiler:
- gcc
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '11'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '8'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '8'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '0'
c_compiler:
- gcc
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '9'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '0'
c_compiler:
- gcc
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
openjdk:
- '9'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '1000'
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
openjdk:
- '10'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '1000'
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
openjdk:
- '10'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '1000'
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
openjdk:
- '11'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build_number_decrement:
- '1000'
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
openjdk:
- '11'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
python:
- '3.7'
zip_keys:
- - c_compiler
- cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
openjdk:
- '8'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
openjdk:
- '8'
pin_run_as_build:
openjdk:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Loading

1 comment on commit 680b7f4

@conda-forge-linter
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

  • @hadim was added to this feedstock maintenance team.

You should get push access to this feedstock and CI services.

Feel free to join the community chat room.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details here

Please sign in to comment.