diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 974e878..3b9dee7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,6 +12,14 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_: + CONFIG: linux_aarch64_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_: + CONFIG: linux_ppc64le_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 13e526a..a192c0b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -72,6 +73,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 0bc67ef..f903b34 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libcurl: - '7' libtiff: -- '4' +- '4.5' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 3deab9b..ae55379 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libcurl: - '7' libtiff: -- '4' +- '4.5' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 8850455..c94e2a1 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libcurl: - '7' libtiff: -- '4' +- '4.5' sqlite: - '3' target_platform: diff --git a/.ci_support/migrations/libtiff45.yaml b/.ci_support/migrations/libtiff45.yaml new file mode 100644 index 0000000..2c67c27 --- /dev/null +++ b/.ci_support/migrations/libtiff45.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libtiff: +- '4.5' +migrator_ts: 1671403615.5901675 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 4fa0abc..dabd023 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libcurl: - '7' libtiff: -- '4' +- '4.5' macos_machine: - x86_64-apple-darwin13.4.0 sqlite: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 9b6043f..f5d3c66 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libcurl: - '7' libtiff: -- '4' +- '4.5' macos_machine: - arm64-apple-darwin20.0.0 sqlite: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index ffbc348..b3a8500 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -9,7 +9,7 @@ cxx_compiler: libcurl: - '7' libtiff: -- '4' +- '4.5' sqlite: - '3' target_platform: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 58a72eb..0000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 916c78e..c284407 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
diff --git a/conda-forge.yml b/conda-forge.yml index c2aebe3..0828bfb 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,15 @@ -build_platform: {osx_arm64: osx_64} +build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 + osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true -provider: {linux_aarch64: default, linux_ppc64le: default, win: azure} -test_on_native_only: true github: branch_name: main tooling_branch_name: main -conda_build: - pkg_format: '2' +provider: + linux_aarch64: default + linux_ppc64le: default + win: azure +test_on_native_only: true diff --git a/recipe/build.sh b/recipe/build.sh index 844eda3..570dd6f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -20,7 +20,7 @@ make -j${CPU_COUNT} ${VERBOSE_CM} # skip tests on linux32 due to rounding error causing issues if [[ ! ${HOST} =~ .*linux.* ]] || [[ ! ${ARCH} == 32 ]]; then -if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" ]]; then +if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then ctest --output-on-failure fi fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2675263..ef3d0fc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: - 0001-disable-geodsigntest.patch build: - number: 0 + number: 1 run_exports: # so name changes in bugfix revisions. Pin to bugfix revision. # https://abi-laboratory.pro/tracker/timeline/proj/
Azure