Skip to content

Commit

Permalink
Merge pull request #2 from regro-cf-autotick-bot/rebuild
Browse files Browse the repository at this point in the history
Rebuild for Python 3.7, GCC 7, R 3.5.1, openBLAS 0.3.2
  • Loading branch information
cbrueffer committed Nov 17, 2018
2 parents c663549 + 74ac254 commit ada0624
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 241 deletions.
56 changes: 0 additions & 56 deletions .appveyor.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .ci_support/linux_r_base3.4.1target_platformlinux-64.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ channel_targets:
cran_mirror:
- https://cran.r-project.org
docker_image:
- condaforge/linux-anvil
- condaforge/linux-anvil-comp7
pin_run_as_build:
r-base:
max_pin: x.x.x
r_base:
- 3.5.1
target_platform:
- linux-64
zip_keys:
- - channel_sources
- channel_targets
- docker_image
- build_number_decrement
23 changes: 0 additions & 23 deletions .ci_support/osx_r_base3.4.1target_platformosx-64.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions .ci_support/osx_r_base3.5.1target_platformosx-64.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions .ci_support/win_r_base3.4.1target_platformwin-64.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions .ci_support/win_r_base3.5.1target_platformwin-64.yaml

This file was deleted.

24 changes: 3 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,11 @@
version: 2

jobs:
build_linux_r_base3.4.1target_platformlinux-64:
build_linux_target_platformlinux-64:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_r_base3.4.1target_platformlinux-64"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./.circleci/fast_finish_ci_pr_build.sh
./.circleci/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./.circleci/run_docker_build.sh
build_linux_r_base3.5.1target_platformlinux-64:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_r_base3.5.1target_platformlinux-64"
- CONFIG: "linux_target_platformlinux-64"
steps:
- checkout
- run:
Expand All @@ -40,5 +23,4 @@ workflows:
version: 2
build_and_test:
jobs:
- build_linux_r_base3.4.1target_platformlinux-64
- build_linux_r_base3.5.1target_platformlinux-64
- build_linux_target_platformlinux-64
64 changes: 0 additions & 64 deletions .travis.yml

This file was deleted.

5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ Summary: A colour picker that can be used as an input in Shiny apps or Rmarkdown
Current build status
====================

[![Linux](https://img.shields.io/circleci/project/github/conda-forge/r-colourpicker-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/r-colourpicker-feedstock)
[![OSX](https://img.shields.io/travis/conda-forge/r-colourpicker-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/r-colourpicker-feedstock)
[![Windows](https://img.shields.io/appveyor/ci/conda-forge/r-colourpicker-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/r-colourpicker-feedstock/branch/master)
All platforms:
[![noarch](https://img.shields.io/circleci/project/github/conda-forge/r-colourpicker-feedstock/master.svg?label=noarch)](https://circleci.com/gh/conda-forge/r-colourpicker-feedstock)

Current release info
====================
Expand Down
11 changes: 6 additions & 5 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
travis:
secure:
BINSTAR_TOKEN: hH2pi6I0h/MF8LJkKuu9cpQq6jIs4h8DDdphftefb0FQUNz3bmeOlHwCz/5FloDX/cnCNAcSwdkP5nJN3nu615Xh6WcS8fY5tlaMBFg50lXF5GCpEkGpk5sAEJtkBxpHT2OEaTjzEf3nLqUd9Nus12J0X2/Sc/UU1dZMNTxBDTD0t4MMKOfIVKk5FwrcWaXPbuUmKbjRtA3iC03rhSxST0L9gVAHb/WU5H4x7AIKzFeZlMoBBmZ+j7OuUpAzT3zgfqe3ZDtnpiFAdwkDHKJZU64wqInIonu4FJaRShjYqDzvZasoreeWy8d6M8XpgzN8l8G6Cd1oOM4P/xwuCfaJ5vitzdqMbT5+sOlObdQrqAjFV9hGDY/VYuUWsPWMuRsTZ7rs3XeE4rIqXrrGUDOkB4aRNpSCpYECe+gAH3CcUaeisgVY0R5nIFqgCTO+rmQOcJ4LoGa6VKDmPXLDx+Fo+fmn7SCFVT3j/bkuJZ600nYctV6She6C5ofB8g/2UeVJA/W0ceGe7eGWmCLaWIdi+rT1B9NW4uunrC7ZoNDXzQHcI92x6P/1bSRgKlZG07Mv2sBmTDXU02sxESLv5TCHB/uChi9k3Ysc1hJ6C8dJAgq/zwRzHIurHyipXcSYFB5qzOrcn0eDJ952ZVFcs/K7pXlPAb2K4GEgTwzrsxpnlgI=
appveyor:
secure:
BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1
secure: {BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1}
compiler_stack: comp7
max_py_ver: '37'
max_r_ver: '35'
travis:
secure: {BINSTAR_TOKEN: hH2pi6I0h/MF8LJkKuu9cpQq6jIs4h8DDdphftefb0FQUNz3bmeOlHwCz/5FloDX/cnCNAcSwdkP5nJN3nu615Xh6WcS8fY5tlaMBFg50lXF5GCpEkGpk5sAEJtkBxpHT2OEaTjzEf3nLqUd9Nus12J0X2/Sc/UU1dZMNTxBDTD0t4MMKOfIVKk5FwrcWaXPbuUmKbjRtA3iC03rhSxST0L9gVAHb/WU5H4x7AIKzFeZlMoBBmZ+j7OuUpAzT3zgfqe3ZDtnpiFAdwkDHKJZU64wqInIonu4FJaRShjYqDzvZasoreeWy8d6M8XpgzN8l8G6Cd1oOM4P/xwuCfaJ5vitzdqMbT5+sOlObdQrqAjFV9hGDY/VYuUWsPWMuRsTZ7rs3XeE4rIqXrrGUDOkB4aRNpSCpYECe+gAH3CcUaeisgVY0R5nIFqgCTO+rmQOcJ4LoGa6VKDmPXLDx+Fo+fmn7SCFVT3j/bkuJZ600nYctV6She6C5ofB8g/2UeVJA/W0ceGe7eGWmCLaWIdi+rT1B9NW4uunrC7ZoNDXzQHcI92x6P/1bSRgKlZG07Mv2sBmTDXU02sxESLv5TCHB/uChi9k3Ysc1hJ6C8dJAgq/zwRzHIurHyipXcSYFB5qzOrcn0eDJ952ZVFcs/K7pXlPAb2K4GEgTwzrsxpnlgI=}
3 changes: 3 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@

#!/bin/bash
if [[ $target_platform =~ linux.* ]] || [[ $target_platform == win-32 ]] || [[ $target_platform == win-64 ]] || [[ $target_platform == osx-64 ]]; then
export DISABLE_AUTOBREW=1
mv DESCRIPTION DESCRIPTION.old
grep -v '^Priority: ' DESCRIPTION.old > DESCRIPTION
$R CMD INSTALL --build .
else
mkdir -p $PREFIX/lib/R/library/colourpicker
Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ source:
sha256: f1dacbafb05c09f61b9bdd0fdcee5344409759b042a71ec46d7c9e3710107b7c

build:
noarch: generic
merge_build_host: True # [win]
number: 1
skip: true # [win32]
number: 1001
rpaths:
- lib/R/lib/
- lib/
Expand Down

1 comment on commit ada0624

@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.

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.