Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let's see how this goes. #61

Merged
merged 30 commits into from
Nov 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5bfdcad
bump build number
Oct 13, 2018
4427622
MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.11
Oct 13, 2018
11f0796
MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.11.3
scopatz Nov 6, 2018
4d74fb8
seems to need C++ on new compilers on linux
scopatz Nov 6, 2018
bc2eba0
MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.11.3
scopatz Nov 6, 2018
020100d
fix exported variables
scopatz Nov 6, 2018
223cc13
link fixes
scopatz Nov 6, 2018
3dca792
Add more logging in the case of OSX configure failures
mariusvniekerk Nov 7, 2018
dec953e
platform specific linking
scopatz Nov 7, 2018
bc057ae
Re-arrange Windows R layout to be the same as Unix
mingwandroid Dec 29, 2017
dd83a73
Revert "Re-arrange Windows R layout to be the same as Unix"
scopatz Nov 8, 2018
1724a5c
darwin updates
scopatz Nov 8, 2018
97321ff
try to fix copy
scopatz Nov 8, 2018
d1b086a
get rid of weird blas hacks
scopatz Nov 8, 2018
6678a3b
added bzip2 dep
scopatz Nov 8, 2018
76f6bb9
try to fix libiconv and libcurl issue
scopatz Nov 8, 2018
5e556d3
Sync
mingwandroid Nov 9, 2018
4de8757
Support old toolchain which doesn't set INSTALL_NAME_TOOL
mingwandroid Nov 10, 2018
dfccec4
Do not depend upon libgfortran when using new compilers (run_exports …
mingwandroid Nov 10, 2018
63995f7
libopenblas => openblas (avoid defaults)
mingwandroid Nov 10, 2018
ee525a4
Bump build #
mingwandroid Nov 10, 2018
fe75546
Workaround conda-build bug not recognizing {{native}}
isuruf Nov 10, 2018
e96cbd6
Bump build number
isuruf Nov 10, 2018
bb55009
libgfortran is added by compiler
isuruf Nov 10, 2018
fd1ef65
Remove duplicated build until conda/conda-build#3255 is resovled
isuruf Nov 10, 2018
9c0ce41
Pin to msys2-conda-epoch
isuruf Nov 10, 2018
41be7be
MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.11.9
isuruf Nov 10, 2018
abbc721
Fix jinja
isuruf Nov 10, 2018
f0c631f
Keep the linter happy
isuruf Nov 10, 2018
4306df2
Reintroduce RSTUDIO_WHICH_R preservation in activate
mariusvniekerk Nov 11, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1

matrix:
- CONFIG: win_
- CONFIG: win_c_compilervs2015target_platformwin-64
CONDA_INSTALL_LOCN: C:\Miniconda36-x64


Expand All @@ -21,7 +21,7 @@ platform:
install:
# If there is a newer build queued for the same PR, cancel this one.
- cmd: |
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
del ff_ci_pr_build.py

Expand All @@ -41,7 +41,7 @@ install:
- cmd: conda.exe config --add channels conda-forge

# Configure the VM.
- cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1
- cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=2
- cmd: run_conda_forge_build_setup

# Skip .NET project specific build phase.
Expand All @@ -50,4 +50,4 @@ build: off
test_script:
- conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
deploy_script:
- cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml
- cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
build_number_decrement:
- '0'
bzip2:
- '1'
c_compiler:
- gcc
cairo:
- '1.14'
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- condaforge/linux-anvil-comp7
fortran_compiler:
- gfortran
freetype:
- 2.9.1
glib:
- '2.56'
gsl:
- '2.2'
icu:
- '58'
jpeg:
- '9'
krb5:
- '1.16'
libpng:
- 1.6.35
libssh2:
- '1.8'
libtiff:
- 4.0.9
libuuid:
- 2.32.1
libxml2:
- '2.9'
ncurses:
- '6.1'
openblas:
- 0.3.3
pango:
- '1.40'
pin_run_as_build:
bzip2:
max_pin: x
cairo:
max_pin: x.x
freetype:
max_pin: x
glib:
max_pin: x.x
gsl:
max_pin: x.x
icu:
max_pin: x
jpeg:
max_pin: x
krb5:
max_pin: x.x
libpng:
max_pin: x.x
libssh2:
max_pin: x.x
libtiff:
max_pin: x
libuuid:
max_pin: x
libxml2:
max_pin: x.x
ncurses:
max_pin: x.x
openblas:
max_pin: x.x.x
pango:
max_pin: x.x
readline:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
readline:
- '7.0'
target_platform:
- linux-64
tk:
- '8.6'
xz:
- '5.2'
zip_keys:
- - c_compiler
- cxx_compiler
- fortran_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -1,38 +1,58 @@
build_number_decrement:
- '1000'
bzip2:
- '1'
c_compiler:
- toolchain_c
cairo:
- '1.14'
curl:
- '7.59'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
fortran_compiler:
- toolchain_fort
freetype:
- 2.9.1
glib:
- '2.56'
gsl:
- '2.2'
icu:
- '58'
jpeg:
- '9'
krb5:
- '1.14'
- '1.16'
libpng:
- 1.6.34
- 1.6.35
libssh2:
- '1.8'
libtiff:
- 4.0.9
libuuid:
- 2.32.1
libxml2:
- '2.9'
ncurses:
- '6.1'
openssl:
- 1.0.2
openblas:
- 0.3.3
pango:
- '1.40'
pin_run_as_build:
bzip2:
max_pin: x
cairo:
max_pin: x.x
curl:
freetype:
max_pin: x
glib:
max_pin: x.x
gsl:
max_pin: x.x
icu:
Expand All @@ -47,11 +67,13 @@ pin_run_as_build:
max_pin: x.x
libtiff:
max_pin: x
libuuid:
max_pin: x
libxml2:
max_pin: x.x
ncurses:
max_pin: x.x
openssl:
openblas:
max_pin: x.x.x
pango:
max_pin: x.x
Expand All @@ -65,9 +87,19 @@ pin_run_as_build:
max_pin: x.x
readline:
- '7.0'
target_platform:
- linux-64
tk:
- '8.6'
xz:
- '5.2'
zip_keys:
- - c_compiler
- cxx_compiler
- fortran_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
build_number_decrement:
- '0'
bzip2:
- '1'
c_compiler:
- clang
cairo:
- '1.14'
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- clangxx
fortran_compiler:
- gfortran
freetype:
- 2.9.1
gsl:
- '2.2'
icu:
- '58'
jpeg:
- '9'
krb5:
- '1.16'
libiconv:
- '1.15'
libpng:
- 1.6.35
libssh2:
- '1.8'
libtiff:
- 4.0.9
libxml2:
- '2.9'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
ncurses:
- '6.1'
openblas:
- 0.3.3
pango:
- '1.40'
pin_run_as_build:
bzip2:
max_pin: x
cairo:
max_pin: x.x
freetype:
max_pin: x
gsl:
max_pin: x.x
icu:
max_pin: x
jpeg:
max_pin: x
krb5:
max_pin: x.x
libiconv:
max_pin: x.x
libpng:
max_pin: x.x
libssh2:
max_pin: x.x
libtiff:
max_pin: x
libxml2:
max_pin: x.x
ncurses:
max_pin: x.x
openblas:
max_pin: x.x.x
pango:
max_pin: x.x
readline:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
readline:
- '7.0'
target_platform:
- osx-64
tk:
- '8.6'
xz:
- '5.2'
zip_keys:
- - c_compiler
- cxx_compiler
- fortran_compiler
- channel_sources
- channel_targets
- build_number_decrement
zlib:
- '1.2'
Loading