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

include libiconv on linux #36

Merged
merged 2 commits into from
Jul 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,16 @@ jobs:
linux_:
CONFIG: linux_
UPLOAD_PACKAGES: True
DOCKER_IMAGE: condaforge/linux-anvil-comp7
linux_aarch64_:
CONFIG: linux_aarch64_
UPLOAD_PACKAGES: True
DOCKER_IMAGE: condaforge/linux-anvil-aarch64
linux_ppc64le_:
CONFIG: linux_ppc64le_
UPLOAD_PACKAGES: True
DOCKER_IMAGE: condaforge/linux-anvil-ppc64le
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: |
Expand All @@ -33,7 +31,9 @@ jobs:
condition: not(startsWith(variables['CONFIG'], 'linux_64'))
displayName: Configure binfmt_misc

- script: .azure-pipelines/run_docker_build.sh
- script: |
export CI=azure
.azure-pipelines/run_docker_build.sh
displayName: Run docker build
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ 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: |
source activate base
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: {
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ jobs:

# Configure the VM.
- script: |
set "CI=azure"
run_conda_forge_build_setup

displayName: conda-forge build setup


Expand Down
13 changes: 7 additions & 6 deletions .azure-pipelines/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<CONDARC

conda-build:
root-dir: /home/conda/feedstock_root/build_artifacts
root-dir: ${FEEDSTOCK_ROOT}/build_artifacts

CONDARC

Expand All @@ -24,7 +24,8 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge
# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

run_conda_forge_build_setup
source run_conda_forge_build_setup

# make the build number clobber
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

Expand All @@ -35,4 +36,4 @@ if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
fi

touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}"
touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
7 changes: 5 additions & 2 deletions .azure-pipelines/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ fi
mkdir -p "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
rm -f "$DONE_CANARY"
# Not all providers run with a real tty. Disable using one
DOCKER_RUN_ARGS=" "

if [ -z "${CI}" ]; then
DOCKER_RUN_ARGS="-it "
fi

export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}"
docker run ${DOCKER_RUN_ARGS} \
Expand All @@ -62,6 +64,7 @@ docker run ${DOCKER_RUN_ARGS} \
-e BINSTAR_TOKEN \
-e HOST_USER_ID \
-e UPLOAD_PACKAGES \
-e CI \
$DOCKER_IMAGE \
bash \
/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-comp7
libiconv:
- '1.15'
libxml2:
- '2.9'
lz4_c:
Expand All @@ -21,6 +23,8 @@ openssl:
pin_run_as_build:
bzip2:
max_pin: x
libiconv:
max_pin: x.x
libxml2:
max_pin: x.x
lz4-c:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-aarch64
libiconv:
- '1.15'
libxml2:
- '2.9'
lz4_c:
Expand All @@ -27,6 +29,8 @@ openssl:
pin_run_as_build:
bzip2:
max_pin: x
libiconv:
max_pin: x.x
libxml2:
max_pin: x.x
lz4-c:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-ppc64le
libiconv:
- '1.15'
libxml2:
- '2.9'
lz4_c:
Expand All @@ -21,6 +23,8 @@ openssl:
pin_run_as_build:
bzip2:
max_pin: x
libiconv:
max_pin: x.x
libxml2:
max_pin: x.x
lz4-c:
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* @jakirkham
* @mingwandroid
* @ocefpaf
58 changes: 58 additions & 0 deletions build-locally.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#!/usr/bin/env python
#
# 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 = glob.glob(".*/run_docker_build.sh")[0]
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()
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ source:
- patches/0010-Use-CreateSymbolicLinkW-on-Windows-for-symlinks-WIP.patch

build:
number: 1005
number: 1006
skip: true # [win and vc<14]
run_exports:
# https://abi-laboratory.pro/index.php?view=timeline&l=libarchive
Expand All @@ -48,7 +48,7 @@ requirements:
host:
- msinttypes # [win and vc<14]
- bzip2
- libiconv # [osx]
- libiconv # [unix]
- lz4-c
- xz
- lzo
Expand Down