From a0f2935ebd5346f5899d4d8aa909295f27e22845 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 10 Jul 2024 00:26:12 -0500 Subject: [PATCH 1/2] Use tzdata package --- recipe/build-sysroot.sh | 4 +++- recipe/meta.yaml | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/recipe/build-sysroot.sh b/recipe/build-sysroot.sh index dd3cf80..78375f6 100755 --- a/recipe/build-sysroot.sh +++ b/recipe/build-sysroot.sh @@ -4,7 +4,6 @@ mkdir -p ${PREFIX}/${target_machine}-${ctng_vendor}-linux-gnu/sysroot pushd ${PREFIX}/${target_machine}-${ctng_vendor}-linux-gnu/sysroot > /dev/null 2>&1 cp -Rf "${SRC_DIR}"/binary/* . mkdir -p usr/include -cp -Rf "${SRC_DIR}"/binary-tzdata/* usr/ cp -Rf "${SRC_DIR}"/binary-glibc-headers/include/* usr/include/ cp -Rf "${SRC_DIR}"/binary-glibc-devel/* usr/ cp -Rf "${SRC_DIR}"/binary-glibc-static/* usr/ @@ -48,6 +47,9 @@ if [[ "$target_machine" == "s390x" ]]; then ln -s $PWD/lib64/ld-* $PWD/lib64/ld64.so.1 fi +mkdir -p usr/share +ln -sf ${PREFIX}/share/zoneinfo usr/share/zoneinfo + # we don't need these rm -rf usr/share/man rm -rf usr/lib/systemd diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6cb07d3..e7f128c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "2.28" %} {% set kernel_headers_version = "4.18.0" %} -{% set build_number = "3" %} +{% set build_number = "4" %} {% set rpm_url = "https://repo.almalinux.org/vault/8.7/BaseOS/" ~ centos_machine ~ "/os/Packages" %} {% set appstream_rpm_url = "https://repo.almalinux.org/vault/8.7/AppStream/" ~ centos_machine ~ "/os/Packages" %} {% set powertools_rpm_url = "https://repo.almalinux.org/vault/8.7/PowerTools/" ~ centos_machine ~ "/os/Packages" %} @@ -59,10 +59,6 @@ source: sha256: 890ce026fdab076710e1c0ffc6ee808a4c41b75f336529990ead3fa05b5712f3 # [cross_target_platform == "linux-ppc64le"] sha256: c20ecc30eb7f4b2114bc703186608eb4066c0e27487ef98d67214b80c9674fb6 # [cross_target_platform == "linux-s390x"] - - folder: binary-tzdata - url: https://repo.almalinux.org/vault/8.7/BaseOS/x86_64/os/Packages/tzdata-2023c-1.el8.noarch.rpm - sha256: b33647f0a02d09d96fadf9c18ad421931061aaf608e0e7a86e702c9b3f4e3111 - - folder: binary-glibc-langpacks url: {{ rpm_url }}/glibc-all-langpacks-2.28-211.el8.{{ centos_machine }}.rpm sha256: c9b9f8b070c8727770848823f88125370e11d3bc97e2d71ee86e46d65b764a5c # [cross_target_platform == "linux-64"] @@ -134,6 +130,7 @@ outputs: requirements: run: - {{ pin_subpackage('kernel-headers_' ~ cross_target_platform, exact=True) }} + - tzdata test: commands: - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/lib/libc.so.6 From 20b9c01b7bbfcf97b2a38d47398f36ec5a83a2ed Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 22 Oct 2024 12:12:48 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and conda-forge-pinning 2024.10.22.00.14.29 --- .scripts/build_steps.sh | 16 +++++++++------- azure-pipelines.yml | 29 +++++++++++++++++++++++++++-- build-locally.py | 2 +- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6c805a9..f8051ab 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -71,8 +73,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + 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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..95d88f6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,5 +2,30 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + 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]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally.