diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 69c2bb9..2fa5de5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,11 +8,14 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_: - CONFIG: linux_ + linux_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64: + CONFIG: linux_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: condaforge/linux-anvil-comp7 + linux_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64: + CONFIG: linux_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 - maxParallel: 8 timeoutInMinutes: 360 steps: @@ -33,7 +36,6 @@ jobs: export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export UPLOAD_ON_BRANCH="master" .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 2f0399c..fcc1ce6 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,13 +5,21 @@ jobs: - job: osx pool: - vmImage: macOS-10.14 + vmImage: macOS-10.15 strategy: matrix: - osx_: - CONFIG: osx_ + osx_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-64: + CONFIG: osx_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-64 + UPLOAD_PACKAGES: 'True' + osx_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-64: + CONFIG: osx_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-64 + UPLOAD_PACKAGES: 'True' + osx_arm64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64: + CONFIG: osx_arm64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64 + UPLOAD_PACKAGES: 'True' + osx_arm64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64: + CONFIG: osx_arm64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64 UPLOAD_PACKAGES: 'True' - maxParallel: 8 timeoutInMinutes: 360 steps: @@ -21,7 +29,6 @@ jobs: export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export UPLOAD_ON_BRANCH="master" ./.scripts/run_osx_build.sh displayName: Run OSX build env: diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64.yaml similarity index 75% rename from .ci_support/linux_.yaml rename to .ci_support/linux_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64.yaml index c543ec2..74e261b 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64.yaml @@ -2,6 +2,8 @@ channel_sources: - conda-forge,defaults channel_targets: - conda-forge main +cross_platform: +- osx-64 cxx_compiler: - gxx cxx_compiler_version: @@ -17,5 +19,10 @@ pin_run_as_build: max_pin: x zlib: max_pin: x.x +target_platform: +- linux-64 +zip_keys: +- - macos_machine + - cross_platform zlib: - '1.2' diff --git a/.ci_support/linux_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64.yaml b/.ci_support/linux_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64.yaml new file mode 100644 index 0000000..f4f0b0e --- /dev/null +++ b/.ci_support/linux_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64.yaml @@ -0,0 +1,28 @@ +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cross_platform: +- osx-arm64 +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- condaforge/linux-anvil-comp7 +libuuid: +- 2.32.1 +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + libuuid: + max_pin: x + zlib: + max_pin: x.x +target_platform: +- linux-64 +zip_keys: +- - macos_machine + - cross_platform +zlib: +- '1.2' diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-64.yaml similarity index 73% rename from .ci_support/osx_.yaml rename to .ci_support/osx_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-64.yaml index f21e69d..e574510 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-64.yaml @@ -4,16 +4,21 @@ channel_sources: - conda-forge,defaults channel_targets: - conda-forge main +cross_platform: +- osx-64 cxx_compiler: - clang_bootstrap cxx_compiler_version: - '*' macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' pin_run_as_build: zlib: max_pin: x.x +target_platform: +- osx-64 +zip_keys: +- - macos_machine + - cross_platform zlib: - '1.2' diff --git a/.ci_support/osx_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-64.yaml b/.ci_support/osx_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-64.yaml new file mode 100644 index 0000000..d098e76 --- /dev/null +++ b/.ci_support/osx_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-64.yaml @@ -0,0 +1,24 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cross_platform: +- osx-arm64 +cxx_compiler: +- clang_bootstrap +cxx_compiler_version: +- '*' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + zlib: + max_pin: x.x +target_platform: +- osx-64 +zip_keys: +- - macos_machine + - cross_platform +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64.yaml b/.ci_support/osx_arm64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64.yaml new file mode 100644 index 0000000..b061692 --- /dev/null +++ b/.ci_support/osx_arm64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64.yaml @@ -0,0 +1,24 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- https://conda-web.anaconda.org/conda-forge,conda-forge/label/llvm_rc +channel_targets: +- conda-forge main +cross_platform: +- osx-64 +cxx_compiler: +- clang_bootstrap +cxx_compiler_version: +- '*' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + zlib: + max_pin: x.x +target_platform: +- osx-arm64 +zip_keys: +- - macos_machine + - cross_platform +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64.yaml b/.ci_support/osx_arm64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64.yaml new file mode 100644 index 0000000..71e6a37 --- /dev/null +++ b/.ci_support/osx_arm64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64.yaml @@ -0,0 +1,24 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- https://conda-web.anaconda.org/conda-forge,conda-forge/label/llvm_rc +channel_targets: +- conda-forge main +cross_platform: +- osx-arm64 +cxx_compiler: +- clang_bootstrap +cxx_compiler_version: +- '*' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + zlib: + max_pin: x.x +target_platform: +- osx-arm64 +zip_keys: +- - macos_machine + - cross_platform +zlib: +- '1.2' diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b40143b..a6a3390 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @davidbrochart @isuruf @mingwandroid \ No newline at end of file +* @davidbrochart @isuruf @katietz @mingwandroid \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 0d5ef1c..8a4b0d3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -19,7 +19,7 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge +conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -29,13 +29,29 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --suppress-variables \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" -validate_recipe_outputs "${FEEDSTOCK_NAME}" +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + # Drop into an interactive shell + /bin/bash +else + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + fi fi touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index e4d5bab..87ba4db 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -74,6 +74,8 @@ docker run ${DOCKER_RUN_ARGS} \ -e CI \ -e FEEDSTOCK_NAME \ -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d7e3c06..3675dac 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,7 +23,7 @@ source ${HOME}/miniforge3/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes conda-forge-ci-setup=3 conda-build pip +conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip @@ -47,7 +47,12 @@ set -e echo -e "\n\nMaking the build clobber file and running the build." make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + +conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} validate_recipe_outputs "${FEEDSTOCK_NAME}" if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then diff --git a/LICENSE.txt b/LICENSE.txt index cba42cf..5f30279 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2019, conda-forge +Copyright (c) 2015-2020, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 9321e00..b82d8f2 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,9 @@ Home: https://github.com/tpoechtrager/cctools-port Package license: APSL-2.0 -Feedstock license: BSD-3-Clause - -Summary: Darwin Mach-O linker - +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/cctools-and-ld64-feedstock/blob/master/LICENSE.txt) +Summary: Darwin Mach-O cross linker Current build status ==================== @@ -29,17 +27,45 @@ Current build status
Variant | Status | |
---|---|---|
linux | +linux_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformlinux-64 | ++ + + + | +
linux_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformlinux-64 | ++ + + + | +|
osx_64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-64 | ++ + + + | +|
osx_64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-64 | ++ + + + | +|
osx_arm64_cross_platformosx-64macos_machinex86_64-apple-darwin13.4.0target_platformosx-arm64 | - + | |
osx | +osx_arm64_cross_platformosx-arm64macos_machinearm64-apple-darwin20.0.0target_platformosx-arm64 | - + |
Windows | -- - | -|
Linux_ppc64le | -- - | -