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

specify conda-build so that it gets updated. #983

Merged
merged 6 commits into from
Jan 7, 2019
Merged

specify conda-build so that it gets updated. #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9e2eab
specify conda-build>=3.17 for window
hmaarrfk Jan 4, 2019
05de57d
Added a news entry
hmaarrfk Jan 4, 2019
b109c13
Specify that we want an updated version of conda-build where ever we see
hmaarrfk Jan 4, 2019
b8d7de5
Update TEMPLATE.rst
hmaarrfk Jan 4, 2019
5ffda08
Update appveyor_conda_build_version.rst
hmaarrfk Jan 4, 2019
f4c6f0e
With updated conda-build quiet is too quiet
isuruf Jan 5, 2019
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
5 changes: 3 additions & 2 deletions conda_smithy/templates/appveyor.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ install:
- cmd: set PYTHONUNBUFFERED=1

# Configure the VM.
- cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
# Tell conda we want an updated version of conda-forge-ci-setup and conda-build
- cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
- cmd: setup_conda_rc .\ .\{{ recipe_dir }} .\.ci_support\%CONFIG%.yaml
{% if build_setup -%}
{{ build_setup }}{% endif %}
Expand All @@ -53,6 +54,6 @@ install:
build: off

test_script:
- conda.exe build {{ recipe_dir }} -m .ci_support\%CONFIG%.yaml --quiet
- conda.exe build {{ recipe_dir }} -m .ci_support\%CONFIG%.yaml
deploy_script:
- cmd: upload_package .\ .\{{ recipe_dir }} .ci_support\%CONFIG%.yaml
2 changes: 1 addition & 1 deletion conda_smithy/templates/azure-pipelines-osx.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- script: |
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
set -x -e
conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2
conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
displayName: 'Add conda-forge-ci-setup=2'

- script: |
Expand Down
2 changes: 1 addition & 1 deletion conda_smithy/templates/run_osx_build.sh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bash $MINICONDA_FILE -b
echo "Configuring conda."
source ~/miniconda3/bin/activate root

conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
mangle_compiler ./ ./{{ recipe_dir }} .ci_support/${CONFIG}.yaml
setup_conda_rc ./ ./{{ recipe_dir }} ./.ci_support/${CONFIG}.yaml

Expand Down
2 changes: 1 addition & 1 deletion conda_smithy/templates/travis.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ install:
echo "Configuring conda."
source /Users/travis/miniconda3/bin/activate root

conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
setup_conda_rc ./ ./{{ recipe_dir }} ./.ci_support/${CONFIG}.yaml

{% if build_setup -%}
Expand Down
11 changes: 11 additions & 0 deletions news/appveyor_conda_build_version.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**Added:** None

**Changed:** conda-build is now specified along side `conda-forge-ci-setup` installs so that it gets updated to the latest version available during each build.

**Deprecated:** None

**Removed:** None

**Fixed:** None

**Security:** None