diff --git a/.ci_support/linux_64_r_base4.2.yaml b/.ci_support/linux_64_r_base4.2.yaml index 060d0c6..22ea1dd 100644 --- a/.ci_support/linux_64_r_base4.2.yaml +++ b/.ci_support/linux_64_r_base4.2.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.2' target_platform: diff --git a/.ci_support/linux_64_r_base4.3.yaml b/.ci_support/linux_64_r_base4.3.yaml index a9e9e76..4678a94 100644 --- a/.ci_support/linux_64_r_base4.3.yaml +++ b/.ci_support/linux_64_r_base4.3.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_aarch64_r_base4.2.yaml b/.ci_support/linux_aarch64_r_base4.2.yaml index b170261..741d596 100644 --- a/.ci_support/linux_aarch64_r_base4.2.yaml +++ b/.ci_support/linux_aarch64_r_base4.2.yaml @@ -27,7 +27,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.2' target_platform: diff --git a/.ci_support/linux_aarch64_r_base4.3.yaml b/.ci_support/linux_aarch64_r_base4.3.yaml index 188d2f8..12edeb7 100644 --- a/.ci_support/linux_aarch64_r_base4.3.yaml +++ b/.ci_support/linux_aarch64_r_base4.3.yaml @@ -27,7 +27,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_ppc64le_r_base4.2.yaml b/.ci_support/linux_ppc64le_r_base4.2.yaml index 9cbdd1b..6218212 100644 --- a/.ci_support/linux_ppc64le_r_base4.2.yaml +++ b/.ci_support/linux_ppc64le_r_base4.2.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.2' target_platform: diff --git a/.ci_support/linux_ppc64le_r_base4.3.yaml b/.ci_support/linux_ppc64le_r_base4.3.yaml index 036a54e..6f8dbb6 100644 --- a/.ci_support/linux_ppc64le_r_base4.3.yaml +++ b/.ci_support/linux_ppc64le_r_base4.3.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.3' target_platform: diff --git a/.ci_support/migrations/proj931.yaml b/.ci_support/migrations/proj931.yaml new file mode 100644 index 0000000..59f0a47 --- /dev/null +++ b/.ci_support/migrations/proj931.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1701494989.7141423 +proj: +- 9.3.1 diff --git a/.ci_support/osx_64_r_base4.2.yaml b/.ci_support/osx_64_r_base4.2.yaml index 2fba6e8..d5ba2b5 100644 --- a/.ci_support/osx_64_r_base4.2.yaml +++ b/.ci_support/osx_64_r_base4.2.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.2' target_platform: diff --git a/.ci_support/osx_64_r_base4.3.yaml b/.ci_support/osx_64_r_base4.3.yaml index b37e601..e033fbe 100644 --- a/.ci_support/osx_64_r_base4.3.yaml +++ b/.ci_support/osx_64_r_base4.3.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.0 +- 9.3.1 r_base: - '4.3' target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ab7bc8f..5382195 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC 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 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -71,7 +71,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 24983bc..1fa8468 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -77,7 +77,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then /bin/bash else - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9aea6ad..d764df6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: sha256: 5a7c4e994c4e50a1a77f38bac699cf029dffab5e344a52e931d9b3f19f2c0f04 # [win and r_base=="4.1"] build: - number: 1 + number: 2 skip: true # [win] merge_build_host: true # [win] rpaths: