From 01c082ad60c5a64bc902b90ff18ded2e0f79c8f0 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 17 Jul 2024 23:01:49 +0000 Subject: [PATCH 1/3] Rebuild for r-base 4.4 and UCRT mingw toolchain --- .../migrations/r-base44_and_m2w64-ucrt.yaml | 50 +++++++++++++++++++ recipe/meta.yaml | 7 ++- 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 .ci_support/migrations/r-base44_and_m2w64-ucrt.yaml diff --git a/.ci_support/migrations/r-base44_and_m2w64-ucrt.yaml b/.ci_support/migrations/r-base44_and_m2w64-ucrt.yaml new file mode 100644 index 0000000..278dd21 --- /dev/null +++ b/.ci_support/migrations/r-base44_and_m2w64-ucrt.yaml @@ -0,0 +1,50 @@ +migrator_ts: 1718391654 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 + commit_message: "Rebuild for r-base 4.4 and UCRT mingw toolchain" + primary_key: r_base + automerge: True + longterm: True + include_noarch: True + pr_limit: 20 + override_cbc_keys: + - r-base + - r_base + - m2w64_c_compiler_stub + - m2w64_cxx_compiler_stub + - m2w64_fortran_compiler_stub + ordering: + m2w64_c_compiler: + - m2w64-toolchain + - gcc + m2w64_cxx_compiler: + - m2w64-toolchain + - gxx + m2w64_fortran_compiler: + - m2w64-toolchain + - gfortran + m2w64_c_stdlib: + - m2w64-toolchain + - m2w64-sysroot + +r_base: + - 4.3 + - 4.4 +m2w64_c_compiler: # [win] + - gcc # [win] +m2w64_c_compiler_version: # [win] + - 13 # [win] +m2w64_cxx_compiler: # [win] + - gxx # [win] +m2w64_cxx_compiler_version: # [win] + - 13 # [win] +m2w64_fortran_compiler: # [win] + - gfortran # [win] +m2w64_fortran_compiler_version: # [win] + - 13 # [win] +m2w64_c_stdlib: # [win] + - m2w64-sysroot # [win] +m2w64_c_stdlib_version: # [win] + - 12 # [win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 12a06ad..d334108 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,5 @@ {% set version = "17.0.0" %} {% set posix = 'm2-' if win else '' %} -{% set native = 'm2w64-' if win else '' %} package: name: r-arrow @@ -12,9 +11,9 @@ source: build: # Skip on Windows until build problems are fixed - skip: true # [win] - merge_build_host: true # [win] - number: 0 + # Checking windows to see if it passes. Uncomment the line if it fails. + # skip: true # [win] + number: 1 rpaths: - lib/R/lib/ - lib/ From 6a04e1611f91ebb0fb007410749ccaece8ab6dd9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 17 Jul 2024 23:03:03 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.17.19.24.35 --- .azure-pipelines/azure-pipelines-linux.yml | 16 ++- .azure-pipelines/azure-pipelines-osx.yml | 14 +- .azure-pipelines/azure-pipelines-win.yml | 55 ++++++++ ...linux_64_.yaml => linux_64_r_base4.3.yaml} | 0 .ci_support/linux_64_r_base4.4.yaml | 33 +++++ ...h64_.yaml => linux_aarch64_r_base4.3.yaml} | 0 .ci_support/linux_aarch64_r_base4.4.yaml | 37 +++++ .../{osx_64_.yaml => osx_64_r_base4.3.yaml} | 0 .ci_support/osx_64_r_base4.4.yaml | 33 +++++ ...x_arm64_.yaml => osx_arm64_r_base4.3.yaml} | 0 .ci_support/osx_arm64_r_base4.4.yaml | 33 +++++ .ci_support/win_64_r_base4.3.yaml | 14 ++ .ci_support/win_64_r_base4.4.yaml | 14 ++ .scripts/run_win_build.bat | 130 ++++++++++++++++++ README.md | 58 ++++++-- azure-pipelines.yml | 3 +- 16 files changed, 423 insertions(+), 17 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-win.yml rename .ci_support/{linux_64_.yaml => linux_64_r_base4.3.yaml} (100%) create mode 100644 .ci_support/linux_64_r_base4.4.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_r_base4.3.yaml} (100%) create mode 100644 .ci_support/linux_aarch64_r_base4.4.yaml rename .ci_support/{osx_64_.yaml => osx_64_r_base4.3.yaml} (100%) create mode 100644 .ci_support/osx_64_r_base4.4.yaml rename .ci_support/{osx_arm64_.yaml => osx_arm64_r_base4.3.yaml} (100%) create mode 100644 .ci_support/osx_arm64_r_base4.4.yaml create mode 100644 .ci_support/win_64_r_base4.3.yaml create mode 100644 .ci_support/win_64_r_base4.4.yaml create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 94cc204..5bd0393 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_r_base4.3: + CONFIG: linux_64_r_base4.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_: - CONFIG: linux_aarch64_ + linux_64_r_base4.4: + CONFIG: linux_64_r_base4.4 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_r_base4.3: + CONFIG: linux_aarch64_r_base4.3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_r_base4.4: + CONFIG: linux_aarch64_r_base4.4 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7708e23..8844d99 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,17 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_r_base4.3: + CONFIG: osx_64_r_base4.3 UPLOAD_PACKAGES: 'True' - osx_arm64_: - CONFIG: osx_arm64_ + osx_64_r_base4.4: + CONFIG: osx_64_r_base4.4 + UPLOAD_PACKAGES: 'True' + osx_arm64_r_base4.3: + CONFIG: osx_arm64_r_base4.3 + UPLOAD_PACKAGES: 'True' + osx_arm64_r_base4.4: + CONFIG: osx_arm64_r_base4.4 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..b68455a --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,55 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: windows-2022 + strategy: + matrix: + win_64_r_base4.3: + CONFIG: win_64_r_base4.3 + UPLOAD_PACKAGES: 'True' + win_64_r_base4.4: + CONFIG: win_64_r_base4.4 + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp + + steps: + + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + + - script: | + call ".scripts\run_win_build.bat" + displayName: Run Windows build + env: + PYTHONUNBUFFERED: 1 + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_r_base4.3.yaml similarity index 100% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_r_base4.3.yaml diff --git a/.ci_support/linux_64_r_base4.4.yaml b/.ci_support/linux_64_r_base4.4.yaml new file mode 100644 index 0000000..25ceb7b --- /dev/null +++ b/.ci_support/linux_64_r_base4.4.yaml @@ -0,0 +1,33 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.4' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_r_base4.3.yaml similarity index 100% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_r_base4.3.yaml diff --git a/.ci_support/linux_aarch64_r_base4.4.yaml b/.ci_support/linux_aarch64_r_base4.4.yaml new file mode 100644 index 0000000..07fb1b9 --- /dev/null +++ b/.ci_support/linux_aarch64_r_base4.4.yaml @@ -0,0 +1,37 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.4' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_r_base4.3.yaml similarity index 100% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_r_base4.3.yaml diff --git a/.ci_support/osx_64_r_base4.4.yaml b/.ci_support/osx_64_r_base4.4.yaml new file mode 100644 index 0000000..da169a8 --- /dev/null +++ b/.ci_support/osx_64_r_base4.4.yaml @@ -0,0 +1,33 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_r_base4.3.yaml similarity index 100% rename from .ci_support/osx_arm64_.yaml rename to .ci_support/osx_arm64_r_base4.3.yaml diff --git a/.ci_support/osx_arm64_r_base4.4.yaml b/.ci_support/osx_arm64_r_base4.4.yaml new file mode 100644 index 0000000..a30d7d9 --- /dev/null +++ b/.ci_support/osx_arm64_r_base4.4.yaml @@ -0,0 +1,33 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.4' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/win_64_r_base4.3.yaml b/.ci_support/win_64_r_base4.3.yaml new file mode 100644 index 0000000..167a351 --- /dev/null +++ b/.ci_support/win_64_r_base4.3.yaml @@ -0,0 +1,14 @@ +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' +target_platform: +- win-64 diff --git a/.ci_support/win_64_r_base4.4.yaml b/.ci_support/win_64_r_base4.4.yaml new file mode 100644 index 0000000..a9b9084 --- /dev/null +++ b/.ci_support/win_64_r_base4.4.yaml @@ -0,0 +1,14 @@ +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.4' +target_platform: +- win-64 diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..65650bf --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 31f43d3..271e714 100644 --- a/README.md +++ b/README.md @@ -27,31 +27,73 @@ Current build status - + - + - + - + + + + + + + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From a240ce62a7fe87c59928b04a58dfe934441e4845 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 23 Jul 2024 14:19:44 +1100 Subject: [PATCH 3/3] skip windows for now --- recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d334108..607d0df 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,9 +10,7 @@ source: sha256: 9d280d8042e7cf526f8c28d170d93bfab65e50f94569f6a790982a878d8d898d build: - # Skip on Windows until build problems are fixed - # Checking windows to see if it passes. Uncomment the line if it fails. - # skip: true # [win] + skip: true # [win] number: 1 rpaths: - lib/R/lib/
VariantStatus
linux_64linux_64_r_base4.3 - variant + variant
linux_aarch64linux_64_r_base4.4 - variant + variant
osx_64linux_aarch64_r_base4.3 - variant + variant
osx_arm64linux_aarch64_r_base4.4 - variant + variant + +
osx_64_r_base4.3 + + variant + +
osx_64_r_base4.4 + + variant + +
osx_arm64_r_base4.3 + + variant + +
osx_arm64_r_base4.4 + + variant + +
win_64_r_base4.3 + + variant + +
win_64_r_base4.4 + + variant