diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 204327b..0000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,52 +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. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_: - CONFIG: win_64_ - 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/Miniforge3-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_folly_build_extNone.yaml b/.ci_support/linux_64_folly_build_extNone.yaml index 2f4d160..8149103 100644 --- a/.ci_support/linux_64_folly_build_extNone.yaml +++ b/.ci_support/linux_64_folly_build_extNone.yaml @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fmt: -- '10' +- '11' folly_build_ext: - None gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/linux_64_folly_build_extjemalloc.yaml b/.ci_support/linux_64_folly_build_extjemalloc.yaml index 72993b8..83d2073 100644 --- a/.ci_support/linux_64_folly_build_extjemalloc.yaml +++ b/.ci_support/linux_64_folly_build_extjemalloc.yaml @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fmt: -- '10' +- '11' folly_build_ext: - jemalloc gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/linux_aarch64_folly_build_extNone.yaml b/.ci_support/linux_aarch64_folly_build_extNone.yaml index 1bec9fa..f5e0d7c 100644 --- a/.ci_support/linux_aarch64_folly_build_extNone.yaml +++ b/.ci_support/linux_aarch64_folly_build_extNone.yaml @@ -17,11 +17,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fmt: -- '10' +- '11' folly_build_ext: - None gflags: @@ -30,6 +30,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/linux_aarch64_folly_build_extjemalloc.yaml b/.ci_support/linux_aarch64_folly_build_extjemalloc.yaml index ba9dc86..1469bc2 100644 --- a/.ci_support/linux_aarch64_folly_build_extjemalloc.yaml +++ b/.ci_support/linux_aarch64_folly_build_extjemalloc.yaml @@ -17,11 +17,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fmt: -- '10' +- '11' folly_build_ext: - jemalloc gflags: @@ -30,6 +30,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/linux_ppc64le_folly_build_extNone.yaml b/.ci_support/linux_ppc64le_folly_build_extNone.yaml index 751c6cc..fca5e2d 100644 --- a/.ci_support/linux_ppc64le_folly_build_extNone.yaml +++ b/.ci_support/linux_ppc64le_folly_build_extNone.yaml @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fmt: -- '10' +- '11' folly_build_ext: - None gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/linux_ppc64le_folly_build_extjemalloc.yaml b/.ci_support/linux_ppc64le_folly_build_extjemalloc.yaml index e7ded70..221c7fd 100644 --- a/.ci_support/linux_ppc64le_folly_build_extjemalloc.yaml +++ b/.ci_support/linux_ppc64le_folly_build_extjemalloc.yaml @@ -13,11 +13,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fmt: -- '10' +- '11' folly_build_ext: - jemalloc gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/migrations/fmt11.yaml b/.ci_support/migrations/fmt11.yaml new file mode 100644 index 0000000..03c4f7e --- /dev/null +++ b/.ci_support/migrations/fmt11.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for fmt 11 + kind: version + migration_number: 1 +fmt: +- '11' +migrator_ts: 1720374637.828791 diff --git a/.ci_support/osx_64_folly_build_extNone.yaml b/.ci_support/osx_64_folly_build_extNone.yaml index 1a02edd..d75297c 100644 --- a/.ci_support/osx_64_folly_build_extNone.yaml +++ b/.ci_support/osx_64_folly_build_extNone.yaml @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fmt: -- '10' +- '11' folly_build_ext: - None gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/osx_64_folly_build_extjemalloc.yaml b/.ci_support/osx_64_folly_build_extjemalloc.yaml index 0785ff3..51d117b 100644 --- a/.ci_support/osx_64_folly_build_extjemalloc.yaml +++ b/.ci_support/osx_64_folly_build_extjemalloc.yaml @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fmt: -- '10' +- '11' folly_build_ext: - jemalloc gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/osx_arm64_folly_build_extNone.yaml b/.ci_support/osx_arm64_folly_build_extNone.yaml index 621cfd6..08c5d1a 100644 --- a/.ci_support/osx_arm64_folly_build_extNone.yaml +++ b/.ci_support/osx_arm64_folly_build_extNone.yaml @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fmt: -- '10' +- '11' folly_build_ext: - None gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/osx_arm64_folly_build_extjemalloc.yaml b/.ci_support/osx_arm64_folly_build_extjemalloc.yaml index f05bd19..b50b656 100644 --- a/.ci_support/osx_arm64_folly_build_extjemalloc.yaml +++ b/.ci_support/osx_arm64_folly_build_extjemalloc.yaml @@ -15,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fmt: -- '10' +- '11' folly_build_ext: - jemalloc gflags: @@ -26,6 +26,8 @@ glog: - '0.7' libboost_devel: - '1.84' +libboost_headers: +- '1.84' libevent: - 2.1.12 lz4_c: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml deleted file mode 100644 index f883469..0000000 --- a/.ci_support/win_64_.yaml +++ /dev/null @@ -1,36 +0,0 @@ -bzip2: -- '1' -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -fmt: -- '10' -folly_build_ext: -- None -gflags: -- '2.2' -glog: -- '0.7' -libboost_devel: -- '1.84' -libevent: -- 2.1.12 -lz4_c: -- 1.9.3 -openssl: -- '3' -snappy: -- '1.2' -target_platform: -- win-64 -xz: -- '5' -zlib: -- '1' -zstd: -- '1.5' diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat deleted file mode 100755 index 65650bf..0000000 --- a/.scripts/run_win_build.bat +++ /dev/null @@ -1,130 +0,0 @@ -:: 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 c7ad23a..ec9e6ab 100644 --- a/README.md +++ b/README.md @@ -108,13 +108,6 @@ Current build status variant - - win_64 - - - variant - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..33a441c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,4 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/recipe/build.sh b/recipe/build.sh index 267532c..851798c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -19,6 +19,9 @@ export CXXFLAGS="$CXXFLAGS -DFOLLY_HAVE_CLOCK_GETTIME=1" # Resolves error invalid conversion from 'void (*)() noexcept' to 'google::logging_fail_func_t' {aka 'void (*)() __attribute__((noreturn))'} export CXXFLAGS="$CXXFLAGS -fpermissive" +# Workaround for https://github.com/facebook/folly/issues/2250 +export CXXFLAGS="$CXXFLAGS -DFMT_UNICODE=OFF" + if [[ "${target_platform}" == "linux-aarch64" ]]; then export CXXFLAGS="$CXXFLAGS -flax-vector-conversions" fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5a2b8ff..188dae8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,8 @@ source: - 0001-Add-missing-unistd-include.patch build: - number: 0 + skip: true # [win] + number: 1 string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}{{ build_ext }} ignore_run_exports: - jemalloc # [(not osx) and (folly_build_ext is not undefined and folly_build_ext == "jemalloc")]