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.

Sign up for GitHub

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

update to 3.5.1 #38

Merged
merged 3 commits into from
Dec 23, 2017
Merged

update to 3.5.1 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb68601
update to 3.5.1
ocefpaf Dec 23, 2017
f33a9b2
rerender
ocefpaf Dec 23, 2017
d62000f
re add the skip
ocefpaf Dec 23, 2017
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
14 changes: 7 additions & 7 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,24 @@ install:

# Add path, activate `conda` and update conda.
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: conda update --yes --quiet conda
- cmd: conda.exe update --yes --quiet conda

- cmd: set PYTHONUNBUFFERED=1

# Add our channels.
- cmd: conda config --set show_channel_urls true
- cmd: conda config --remove channels defaults
- cmd: conda config --add channels defaults
- cmd: conda config --add channels conda-forge
- cmd: conda.exe config --set show_channel_urls true
- cmd: conda.exe config --remove channels defaults
- cmd: conda.exe config --add channels defaults
- cmd: conda.exe config --add channels conda-forge

# Configure the VM.
- cmd: conda install -n root --quiet --yes conda-forge-build-setup
- cmd: conda.exe install -n root --quiet --yes conda-forge-build-setup
- cmd: run_conda_forge_build_setup

# Skip .NET project specific build phase.
build: off

test_script:
- conda build recipe --quiet
- conda.exe build recipe --quiet
deploy_script:
- cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main
16 changes: 4 additions & 12 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "protobuf" %}
{% set version = "3.5.0" %}
{% set sha256 = "0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c" %}
{% set version = "3.5.1" %}
{% set sha256 = "826425182ee43990731217b917c5c3ea7190cfda141af4869e6d4ad9085a740f" %}

package:
name: {{ name }}
Expand All @@ -9,18 +9,10 @@ package:
source:
url: https://github.com/google/protobuf/archive/v{{ version }}/{{ name }}-v{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
#######################################################
# Apply patches for pre-C++11 compilers. #
# #
# xref: https://github.com/google/protobuf/pull/4074 #
# xref: https://github.com/google/protobuf/pull/4076 #
#######################################################
- PR_4074.patch
- PR_4076.patch
Copy link
Member

Choose a reason for hiding this comment

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

We should delete the patch files too.

Copy link
Member

Choose a reason for hiding this comment

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

Done in PR ( #39 ).


build:
number: 1
number: 0
skip: True # [win and py27]
features:
- vc9 # [win and py27]
- vc10 # [win and py34]
Expand Down