From 136a5856b67007f60ccc8aaa75799b2538b5db45 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Mon, 20 May 2019 17:37:47 +0000 Subject: [PATCH 1/3] updated v1.38.32 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b601161..d29104e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.38.29" %} +{% set version = "1.38.32" %} package: name: binaryen @@ -7,7 +7,7 @@ package: source: fn: binaryen-{{ version }}.tar.gz url: https://github.com/WebAssembly/binaryen/archive/{{ version }}.tar.gz - sha256: 2cc98dade872a78122b5c1410e82f9762e2735b8676d30bf2ede836002438936 + sha256: 519b1dae68b110dd3c514edcdd2991d4c3693082bb06ac525724a5875bb7bdbf build: number: 0 From d06f75036873dbc182e04f0df9fce37e284de4b9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Mon, 20 May 2019 17:38:07 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.4, and conda-forge-pinning 2019.05.11 --- .azure-pipelines/azure-pipelines-linux.yml | 6 +- .azure-pipelines/azure-pipelines-osx.yml | 37 +++++------- .azure-pipelines/azure-pipelines-win.yml | 4 +- .azure-pipelines/run_docker_build.sh | 21 +++++-- .ci_support/linux_.yaml | 4 ++ .ci_support/osx_.yaml | 4 ++ .circleci/build_steps.sh | 39 ------------- .circleci/checkout_merge_commit.sh | 27 --------- .circleci/config.yml | 22 +++----- .circleci/fast_finish_ci_pr_build.sh | 4 -- .circleci/run_docker_build.sh | 57 ------------------- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .travis.yml | 65 ---------------------- LICENSE.txt | 2 +- README.md | 57 ++++++++++++++++--- 15 files changed, 103 insertions(+), 248 deletions(-) delete mode 100755 .circleci/build_steps.sh delete mode 100755 .circleci/checkout_merge_commit.sh delete mode 100755 .circleci/fast_finish_ci_pr_build.sh delete mode 100755 .circleci/run_docker_build.sh delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b483c2a..7f1c9e3 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -6,20 +6,20 @@ jobs: - job: linux pool: vmImage: ubuntu-16.04 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: linux_: CONFIG: linux_ - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: - script: | sudo pip install --upgrade pip sudo pip install setuptools shyaml displayName: Install dependencies - # configure qemu binfmt-misc running. This allows us to run docker containers + # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 57b5bf5..15034d9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -6,13 +6,13 @@ jobs: - job: osx pool: vmImage: macOS-10.13 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: osx_: CONFIG: osx_ - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? @@ -28,25 +28,18 @@ jobs: rm ~/uninstall_homebrew displayName: Remove homebrew - - script: | - echo "Installing Miniconda" - set -x -e - curl -o $(Build.StagingDirectory)/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh - chmod +x $(Build.StagingDirectory)/miniconda.sh - $(Build.StagingDirectory)/miniconda.sh -b -p $(Build.StagingDirectory)/miniconda - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - echo "Setting up Conda environment" - displayName: 'Install miniconda' + - bash: | + echo "##vso[task.prependpath]$CONDA/bin" + sudo chown -R $USER $CONDA + displayName: Add conda to PATH - 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-build + source activate base + conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml displayName: 'Add conda-forge-ci-setup=2' - script: | - set -x -e - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + source activate base echo "Configuring conda." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml @@ -59,26 +52,22 @@ jobs: displayName: Configure conda and conda-build - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Mangle compiler - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Generate build number clobber file - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml displayName: Build recipe - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Upload recipe env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index e178482..140339b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -6,7 +6,7 @@ jobs: - job: win pool: vmImage: vs2017-win2016 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 4 matrix: @@ -65,7 +65,7 @@ jobs: # Configure the VM - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - + # Configure the VM. - script: | run_conda_forge_build_setup diff --git a/.azure-pipelines/run_docker_build.sh b/.azure-pipelines/run_docker_build.sh index 8ccadb8..7082794 100755 --- a/.azure-pipelines/run_docker_build.sh +++ b/.azure-pipelines/run_docker_build.sh @@ -5,7 +5,7 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. -set -xeuo pipefail +set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" @@ -28,12 +28,25 @@ fi ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" + set +x + FILES=`ls .ci_support/linux_*` + CONFIGS="" + for file in $FILES; do + CONFIGS="${CONFIGS}'${file:12:-5}' or "; + done + echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}" exit 1 fi -pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) +if [ -z "${DOCKER_IMAGE}" ]; then + SHYAML_INSTALLED="$(shyaml --version || echo NO)" + if [ "${SHYAML_INSTALLED}" == "NO" ]; then + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + else + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + fi +fi mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml index 545ec8b..7e88bf4 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_.yaml @@ -1,10 +1,14 @@ c_compiler: - gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - gxx +cxx_compiler_version: +- '7' docker_image: - condaforge/linux-anvil-comp7 diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml index 83ea58d..8805d30 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_.yaml @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - clangxx +cxx_compiler_version: +- '4' macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh deleted file mode 100755 index 1301eb6..0000000 --- a/.circleci/build_steps.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail -export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT=/home/conda/feedstock_root -export RECIPE_ROOT=/home/conda/recipe_root -export CI_SUPPORT=/home/conda/feedstock_root/.ci_support -export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" - -cat >~/.condarc < /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index ac959fd..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,26 +5,20 @@ version: 2 jobs: - build_linux_: + build: working_directory: ~/test machine: true - environment: - - CONFIG: "linux_" 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-comp7 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh + # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. + command: exit 0 workflows: version: 2 build_and_test: jobs: - - build_linux_ + - build: + filters: + branches: + ignore: + - /.*/ diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh deleted file mode 100755 index 4c0b560..0000000 --- a/.circleci/fast_finish_ci_pr_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh deleted file mode 100755 index 8bb0bda..0000000 --- a/.circleci/run_docker_build.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail - -THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" -PROVIDER_DIR="$(basename $THISDIR)" - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" - -docker info - -# In order for the conda-build process in the container to write to the mounted -# volumes, we need to run with the same id as the host machine, which is -# normally the owner of the mounted volumes, or at least has write permission -export HOST_USER_ID=$(id -u) -# Check if docker-machine is being used (normally on OSX) and get the uid from -# the VM -if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then - export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" - -if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" - exit 1 -fi - -pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) - -mkdir -p "$ARTIFACTS" -DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" -rm -f "$DONE_CANARY" -# Enable running in interactive mode attached to a tty -DOCKER_RUN_ARGS=" -it " - -export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" -docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ - -e CONFIG \ - -e BINSTAR_TOKEN \ - -e HOST_USER_ID \ - -e UPLOAD_PACKAGES \ - $DOCKER_IMAGE \ - bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh - -# verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 047fdaf..ba618a2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ Checklist * [ ] Used a fork of the feedstock to propose changes * [ ] Bumped the build number (if the version is unchanged) * [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) +* [ ] [Re-rendered]( https://conda-forge.org/docs/maintainer/updating_pkgs.html#rerendering-feedstocks ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) * [ ] Ensured the license file is being packaged. - About binaryen ============== @@ -18,9 +14,56 @@ Summary: Compiler infrastructure and toolchain library for WebAssembly, in C++ Current build status ==================== -[![Linux](https://img.shields.io/circleci/project/github/conda-forge/binaryen-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/binaryen-feedstock) -[![OSX](https://img.shields.io/travis/conda-forge/binaryen-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/binaryen-feedstock) -[![Windows](https://img.shields.io/appveyor/ci/conda-forge/binaryen-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/binaryen-feedstock/branch/master) + + + + + + + + + + +![ppc64le disabled](https://img.shields.io/badge/ppc64le-disabled-lightgrey.svg) +
Appveyor + + windows + +
Azure +
+ + + + + + + + + + + + + + + + + + +
VariantStatus
linux + + variant + +
osx + + variant + +
win_c_compilervs2015cxx_compilervs2015vc14 + + variant + +
+
+
Current release info ==================== From bec1874f2b8f96e5c1fa61f4225e1a9b60e26e4e Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 10 Nov 2019 23:44:31 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.18.11, conda-smithy 3.6.2, and conda-forge-pinning 2019.11.01 --- .appveyor.yml | 50 --------------- .azure-pipelines/azure-pipelines-linux.yml | 11 ++-- .azure-pipelines/azure-pipelines-osx.yml | 7 ++- .azure-pipelines/azure-pipelines-win.yml | 6 +- .ci_support/osx_.yaml | 4 +- .gitattributes | 18 ++++++ .github/CODEOWNERS | 1 + .github/CONTRIBUTING.md | 15 ----- .github/ISSUE_TEMPLATE.md | 25 -------- .github/PULL_REQUEST_TEMPLATE.md | 18 ------ {.azure-pipelines => .scripts}/build_steps.sh | 13 ++-- .../run_docker_build.sh | 11 +++- README.md | 16 +++-- build-locally.py | 63 +++++++++++++++++++ 14 files changed, 119 insertions(+), 139 deletions(-) delete mode 100644 .appveyor.yml create mode 100644 .github/CODEOWNERS delete mode 100644 .github/CONTRIBUTING.md delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md rename {.azure-pipelines => .scripts}/build_steps.sh (75%) rename {.azure-pipelines => .scripts}/run_docker_build.sh (92%) create mode 100755 build-locally.py diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 5d96658..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This file was automatically generated by conda-smithy. To update a component of this -# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run -# "conda smithy rerender". -# -*- mode: yaml -*- - -environment: - - BINSTAR_TOKEN: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 - - matrix: - - CONFIG: win_c_compilervs2015cxx_compilervs2015vc14 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -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/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" - "%CONDA_INSTALL_LOCN%\python.exe" ff_ci_pr_build.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" - del ff_ci_pr_build.py - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - - cmd: rmdir C:\cygwin /s /q - - # Add path, activate `conda` and update conda. - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - cmd: conda.exe update --yes --quiet conda - - - cmd: set PYTHONUNBUFFERED=1 - - # Configure the VM. - # 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 .\.ci_support\%CONFIG%.yaml - - cmd: run_conda_forge_build_setup - -# Skip .NET project specific build phase. -build: off - -test_script: - - conda.exe build recipe -m .ci_support\%CONFIG%.yaml -deploy_script: - - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7f1c9e3..9ffb709 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,12 +13,8 @@ jobs: linux_: CONFIG: linux_ UPLOAD_PACKAGES: True + DOCKER_IMAGE: condaforge/linux-anvil-comp7 steps: - - script: | - sudo pip install --upgrade pip - sudo pip install setuptools shyaml - displayName: Install dependencies - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -27,7 +23,10 @@ jobs: condition: not(startsWith(variables['CONFIG'], 'linux_64')) displayName: Configure binfmt_misc - - script: .azure-pipelines/run_docker_build.sh + - script: | + export CI=azure + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + .scripts/run_docker_build.sh displayName: Run docker build env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 15034d9..ca72508 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -35,7 +35,7 @@ jobs: - script: | source activate base - conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml + conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build displayName: 'Add conda-forge-ci-setup=2' - script: | @@ -43,7 +43,7 @@ jobs: echo "Configuring conda." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - + export CI=azure source run_conda_forge_build_setup conda update --yes --quiet --override-channels -c conda-forge -c defaults --all env: { @@ -68,8 +68,9 @@ jobs: - script: | source activate base + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml - displayName: Upload recipe + displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 140339b..055b40d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -13,7 +13,7 @@ jobs: win_c_compilervs2015cxx_compilervs2015vc14: CONFIG: win_c_compilervs2015cxx_compilervs2015vc14 CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? - script: | @@ -68,8 +68,8 @@ jobs: # Configure the VM. - script: | + set "CI=azure" run_conda_forge_build_setup - displayName: conda-forge build setup @@ -95,7 +95,9 @@ jobs: condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml index 8805d30..8958130 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '4' +- '9' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '4' +- '9' macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: diff --git a/.gitattributes b/.gitattributes index 974953e..ac943c1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,21 @@ meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf + +# github helper pieces to make some files not show up in diffs automatically +.azure-pipelines/* linguist-generated=true +.circleci/* linguist-generated=true +.drone/* linguist-generated=true +.drone.yml linguist-generated=true +.github/* linguist-generated=true +.travis/* linguist-generated=true +.appveyor.yml linguist-generated=true +.gitattributes linguist-generated=true +.gitignore linguist-generated=true +.travis.yml linguist-generated=true +.scripts linguist-generated=true +LICENSE.txt linguist-generated=true +README.md linguist-generated=true +azure-pipelines.yml linguist-generated=true +build-locally.py linguist-generated=true +shippable.yml linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..79d9561 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @jakirkham \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index d87090f..0000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,15 +0,0 @@ -Thanks for your interest in helping out conda-forge. - -Whether you are brand new or a seasoned maintainer, we always appreciate -feedback from the community about how we can improve conda-forge. If you -are submitting a PR or issue, please fill out the respective template. Should -any questions arise please feel free to ask the maintainer team of the -respective feedstock or reach out to `@conda-forge/core` for more complex -issues. - -In the case of any issues reported, please be sure to demonstrate the relevant -issue (even if it is an absence of a feature). Providing this information will -help busy maintainers understand what it is you hope to accomplish. Also this -will help provide them clues as to what might be going wrong. These examples -can also be reused as tests in the build to ensure further packages meet these -criteria. This is requested to help you get timely and relevant feedback. :) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index fc95334..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ - -Issue: - -
-Environment (conda list): -
- -``` -$ conda list - -``` -
- -
-Details about conda and system ( conda info ): -
- -``` -$ conda info - -``` -
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index ba618a2..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ - -Checklist -* [ ] Used a fork of the feedstock to propose changes -* [ ] Bumped the build number (if the version is unchanged) -* [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/maintainer/updating_pkgs.html#rerendering-feedstocks ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) -* [ ] Ensured the license file is being packaged. - - - - diff --git a/.azure-pipelines/build_steps.sh b/.scripts/build_steps.sh similarity index 75% rename from .azure-pipelines/build_steps.sh rename to .scripts/build_steps.sh index 779d52b..8a4af44 100755 --- a/.azure-pipelines/build_steps.sh +++ b/.scripts/build_steps.sh @@ -7,15 +7,15 @@ set -xeuo pipefail export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT=/home/conda/feedstock_root -export RECIPE_ROOT=/home/conda/recipe_root -export CI_SUPPORT=/home/conda/feedstock_root/.ci_support +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" +export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < - Appveyor - - - windows - - - + @@ -62,7 +55,12 @@ Current build status -![ppc64le disabled](https://img.shields.io/badge/ppc64le-disabled-lightgrey.svg) + + + +
Azure
Linux_ppc64le + ppc64le disabled +
Current release info diff --git a/build-locally.py b/build-locally.py new file mode 100755 index 0000000..8f7ecca --- /dev/null +++ b/build-locally.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python3 +# +# This file has been generated by conda-smithy in order to build the recipe +# locally. +# +import os +import glob +import subprocess +from argparse import ArgumentParser + + +def setup_environment(ns): + os.environ["CONFIG"] = ns.config + os.environ["UPLOAD_PACKAGES"] = "False" + + +def run_docker_build(ns): + script = ".scripts/run_docker_build.sh" + subprocess.check_call([script]) + + +def verify_config(ns): + valid_configs = { + os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + } + print(f"valid configs are {valid_configs}") + if ns.config in valid_configs: + print("Using " + ns.config + " configuration") + return + elif len(valid_configs) == 1: + ns.config = valid_configs.pop() + print("Found " + ns.config + " configuration") + elif ns.config is None: + print("config not selected, please choose from the following:\n") + selections = list(enumerate(sorted(valid_configs), 1)) + for i, c in selections: + print(f"{i}. {c}") + s = input("\n> ") + idx = int(s) - 1 + ns.config = selections[idx][1] + print(f"selected {ns.config}") + else: + raise ValueError("config " + ns.config + " is not valid") + # Remove the following, as implemented + if not ns.config.startswith("linux"): + raise ValueError( + f"only Linux configs currently supported, got {ns.config}" + ) + + +def main(args=None): + p = ArgumentParser("build-locally") + p.add_argument("config", default=None, nargs="?") + + ns = p.parse_args(args=args) + verify_config(ns) + setup_environment(ns) + + run_docker_build(ns) + + +if __name__ == "__main__": + main()