From 98f7b242af4d946dd43a7dcbdb40c4ef54a6d27c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 10 Apr 2024 09:59:22 -0500 Subject: [PATCH] Switch to cross-compilation for `linux_aarch64` and `linux_ppc64le` --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++++ .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/win_64_.yaml | 2 ++ .travis.yml | 30 ---------------------- README.md | 9 +------ conda-forge.yml | 3 +++ recipe/meta.yaml | 2 +- 8 files changed, 17 insertions(+), 41 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..aef462c 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 variables: {} diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 23e6f36..b72a291 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 3adf975..55ef512 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index d1d2b41..3860cc2 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -2,6 +2,8 @@ c_compiler: - vs2019 c_stdlib: - vs +c_stdlib_version: +- '2019' channel_sources: - conda-forge channel_targets: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c833fba..0000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +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 flow_run_id="travis_$TRAVIS_JOB_ID" - - export sha="$TRAVIS_COMMIT" - - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" - - 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 8319ec1..37cdc1b 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
diff --git a/conda-forge.yml b/conda-forge.yml index f6ab364..04c24b6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,6 @@ +build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 conda_build: error_overlinking: false conda_forge_output_validation: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5713a56..369e236 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,7 @@ source: sha256: 698140f12da055a3709eee2e022fcfe7bc8edf31f30115e3f7a5c877a9491de5 # [win] build: - number: 0 + number: 1 binary_relocation: false skip: true # [osx]
Azure