From 87e7e60b3859a21a212563d02ec1d474f99d0119 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Tue, 5 Nov 2024 15:57:19 -0500 Subject: [PATCH] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.0, and conda-forge-pinning 2024.11.05.20.51.45 --- .azure-pipelines/azure-pipelines-linux.yml | 4 +--- .azure-pipelines/azure-pipelines-osx.yml | 4 +--- .ci_support/linux_64_fmt11spdlog1.14.yaml | 2 ++ .ci_support/linux_64_fmt9spdlog1.11.yaml | 2 ++ .ci_support/osx_64_.yaml | 6 ++++-- .ci_support/osx_arm64_.yaml | 6 ++++-- .github/workflows/automerge.yml | 17 ----------------- .github/workflows/webservices.yml | 13 ------------- .scripts/build_steps.sh | 7 +------ .scripts/run_docker_build.sh | 2 -- .scripts/run_osx_build.sh | 9 ++------- azure-pipelines.yml | 2 +- 12 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/automerge.yml delete mode 100644 .github/workflows/webservices.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b794eb6..cbcd367 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -44,6 +44,4 @@ jobs: .scripts/run_docker_build.sh displayName: Run docker build env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + 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 8a8f9a8..72419bd 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -36,6 +36,4 @@ jobs: ./.scripts/run_osx_build.sh displayName: Run OSX build env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_fmt11spdlog1.14.yaml b/.ci_support/linux_64_fmt11spdlog1.14.yaml index 9a28ad8..b8078ec 100644 --- a/.ci_support/linux_64_fmt11spdlog1.14.yaml +++ b/.ci_support/linux_64_fmt11spdlog1.14.yaml @@ -45,6 +45,8 @@ spdlog: - '1.14' target_platform: - linux-64 +tiledb: +- '2.26' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_fmt9spdlog1.11.yaml b/.ci_support/linux_64_fmt9spdlog1.11.yaml index d1ac445..e094903 100644 --- a/.ci_support/linux_64_fmt9spdlog1.11.yaml +++ b/.ci_support/linux_64_fmt9spdlog1.11.yaml @@ -45,6 +45,8 @@ spdlog: - '1.11' target_platform: - linux-64 +tiledb: +- '2.26' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 1f6e4df..b8b2a3e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' macos_machine: @@ -45,6 +45,8 @@ spdlog: - '1.14' target_platform: - osx-64 +tiledb: +- '2.26' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3b54373..0ab5ccb 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' macos_machine: @@ -45,6 +45,8 @@ spdlog: - '1.14' target_platform: - osx-arm64 +tiledb: +- '2.26' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6a..0000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5..0000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 827a29f..352d052 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -80,16 +80,11 @@ else command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null - ( startgroup "Validating outputs" ) 2> /dev/null - - validate_recipe_outputs "${FEEDSTOCK_NAME}" - - ( endgroup "Validating outputs" ) 2> /dev/null ( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi ( endgroup "Uploading packages" ) 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 00f377a..a16e7e7 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -101,8 +101,6 @@ docker run ${DOCKER_RUN_ARGS} \ -e remote_url \ -e sha \ -e BINSTAR_TOKEN \ - -e FEEDSTOCK_TOKEN \ - -e STAGING_BINSTAR_TOKEN \ "${DOCKER_IMAGE}" \ bash \ "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 7f948c4..97cb86a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -33,7 +33,7 @@ rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true ( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - +echo "Activating environment" source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" @@ -103,16 +103,11 @@ else command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null - ( startgroup "Validating outputs" ) 2> /dev/null - - validate_recipe_outputs "${FEEDSTOCK_NAME}" - - ( endgroup "Validating outputs" ) 2> /dev/null ( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml fi ( endgroup "Uploading packages" ) 2> /dev/null diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 67d82fa..013bdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ stages: echo "##vso[task.setvariable variable=log]$git_log" displayName: Obtain commit message - bash: echo "##vso[task.setvariable variable=RET]false" - condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) displayName: Skip build? - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" name: result