From 6ee5c58e6e90260c3cd7a7e81fc316455061c0d9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:10:25 +0000 Subject: [PATCH 1/3] Rebuild for libxcb 1.16 --- .ci_support/migrations/libxcb116.yaml | 10 ++++++++++ recipe/conda_build_config.yaml | 5 ++++- recipe/meta.yaml | 5 ++--- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 .ci_support/migrations/libxcb116.yaml diff --git a/.ci_support/migrations/libxcb116.yaml b/.ci_support/migrations/libxcb116.yaml new file mode 100644 index 00000000..10bbb145 --- /dev/null +++ b/.ci_support/migrations/libxcb116.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libxcb 1.16 + kind: version + migration_number: 1 + +# TODO: Add to global pinnins once migration completed +libxcb: +- '1.16' +migrator_ts: 1718798196 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 7c0b81e3..1e434e98 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -3,7 +3,7 @@ c_compiler_version: # [osx] - 15 # [osx] cxx_compiler_version: # [osx] - 15 # [osx] -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +c_stdlib_version: # [osx and x86_64] - '10.13' # [osx and x86_64] MACOSX_SDK_VERSION: # [osx and x86_64] - '10.14' # [osx and x86_64] @@ -23,3 +23,6 @@ replacements: - '*.cmake' regex_re: '([^;\s"]+/sysroot)' replacement_re: '$ENV{CONDA_BUILD_SYSROOT}' + +c_stdlib_version: # [linux] + - "2.17" # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 21bec925..5d83c6c5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,7 +53,7 @@ source: folder: opengl32sw # [win64] build: - number: 21 + number: 22 detect_binary_files_with_prefix: true run_exports: - {{ pin_subpackage('qt-main', max_pin='x.x') }} @@ -67,8 +67,8 @@ build: requirements: build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - - sysroot_linux-64 2.17 # [linux] - {{ cdt('mesa-libgl-devel') }} # [linux] - {{ cdt('mesa-libegl-devel') }} # [linux] - {{ cdt('mesa-dri-drivers') }} # [linux] @@ -184,7 +184,6 @@ requirements: - xorg-libice # [linux] - xorg-xf86vidmodeproto # [linux] run_constrained: - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.14") }} # [osx and x86_64] - qt {{ version }} test: From 9c0e0ccc695627fd0fec23fe77197ecde4a1b7cd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:11:34 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.20.09.51.34 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 6 +++--- .ci_support/linux_aarch64_.yaml | 6 +++--- .ci_support/linux_ppc64le_.yaml | 6 +++--- .ci_support/migrations/krb5121.yaml | 7 ------- .ci_support/migrations/libxcb115.yaml | 9 --------- .ci_support/migrations/pulseaudio17.yaml | 12 ------------ .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 4 +++- .ci_support/win_64_.yaml | 2 +- .gitattributes | 4 ++-- .github/CODEOWNERS | 2 +- .scripts/build_steps.sh | 7 +++++++ .scripts/run_osx_build.sh | 7 +++++++ .scripts/run_win_build.bat | 5 +++++ .travis.yml | 4 ++-- README.md | 1 - 17 files changed, 39 insertions(+), 47 deletions(-) delete mode 100644 .ci_support/migrations/krb5121.yaml delete mode 100644 .ci_support/migrations/libxcb115.yaml delete mode 100644 .ci_support/migrations/pulseaudio17.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 730a6268..7708e23e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 67d4905f..1e43e969 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -47,7 +47,7 @@ libpng: libsqlite: - '3' libxcb: -- '1.15' +- '1.16' libxml2: - '2' nspr: @@ -59,7 +59,7 @@ openssl: postgresql: - '16' pulseaudio_client: -- '17' +- '17.0' target_platform: - linux-64 zip_keys: @@ -68,6 +68,6 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 366f8f19..72bd5def 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -51,7 +51,7 @@ libpng: libsqlite: - '3' libxcb: -- '1.15' +- '1.16' libxml2: - '2' nspr: @@ -63,7 +63,7 @@ openssl: postgresql: - '16' pulseaudio_client: -- '17' +- '17.0' target_platform: - linux-aarch64 zip_keys: @@ -72,6 +72,6 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 3a1fb67e..5ee46421 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -47,7 +47,7 @@ libpng: libsqlite: - '3' libxcb: -- '1.15' +- '1.16' libxml2: - '2' nspr: @@ -59,7 +59,7 @@ openssl: postgresql: - '16' pulseaudio_client: -- '17' +- '17.0' target_platform: - linux-ppc64le zip_keys: @@ -68,6 +68,6 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/migrations/krb5121.yaml b/.ci_support/migrations/krb5121.yaml deleted file mode 100644 index 5912698d..00000000 --- a/.ci_support/migrations/krb5121.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -krb5: -- '1.21' -migrator_ts: 1689171408.1479406 diff --git a/.ci_support/migrations/libxcb115.yaml b/.ci_support/migrations/libxcb115.yaml deleted file mode 100644 index 47a46f97..00000000 --- a/.ci_support/migrations/libxcb115.yaml +++ /dev/null @@ -1,9 +0,0 @@ -migrator_ts: 1684619068 -__migrator: - kind: version - migration_number: 1 - bump_number: 1 - -# Remember to add to global pinnings -libxcb: - - '1.15' diff --git a/.ci_support/migrations/pulseaudio17.yaml b/.ci_support/migrations/pulseaudio17.yaml deleted file mode 100644 index 6d921b68..00000000 --- a/.ci_support/migrations/pulseaudio17.yaml +++ /dev/null @@ -1,12 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for pulseaudio 17 - kind: version - migration_number: 1 -migrator_ts: 1705695822.065136 -pulseaudio: -- '17' -pulseaudio_client: -- '17' -pulseaudio_daemon: -- '17' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9d057aca..31a15d3f 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -46,6 +46,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 2ac8d013..4fa00ad1 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -44,6 +46,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 3999ce1a..21847af0 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -29,6 +29,6 @@ openssl: target_platform: - win-64 zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 80e60f66..0b552bc8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @Tobias-Fischer @andfoy @ccordoba12 @duncanmmacleod @gillins @jschueller @matthiasdiener @mingwandroid @msarahan @ocefpaf @stuarteberg \ No newline at end of file +* @Tobias-Fischer @andfoy @ccordoba12 @gillins @jschueller @matthiasdiener @mingwandroid @msarahan @ocefpaf @stuarteberg \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 50dfdd8c..165b078e 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -80,6 +80,13 @@ else --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:-}" + + ( 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" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 48afb610..ad47a13c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --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" + + ( 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" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 4a473ae6..3021d16e 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ 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:*/=%" diff --git a/.travis.yml b/.travis.yml index c833fba0..0edc9143 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -language: generic +language: shell -matrix: +jobs: include: - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux diff --git a/README.md b/README.md index d638f7b4..0637a772 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,6 @@ Feedstock Maintainers * [@Tobias-Fischer](https://github.com/Tobias-Fischer/) * [@andfoy](https://github.com/andfoy/) * [@ccordoba12](https://github.com/ccordoba12/) -* [@duncanmmacleod](https://github.com/duncanmmacleod/) * [@gillins](https://github.com/gillins/) * [@jschueller](https://github.com/jschueller/) * [@matthiasdiener](https://github.com/matthiasdiener/) From 5c5e76c56c30e837ac6e36c4e8ca32cf77c118e3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Fri, 21 Jun 2024 17:54:52 -0400 Subject: [PATCH 3/3] =?UTF-8?q?=20=F0=9F=A7=AA=20(manually=20install=20mis?= =?UTF-8?q?sing=20VS=20components=20on=20windows)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .azure-pipelines/azure-pipelines-win.yml | 26 +++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 0876c868..c9f69ac6 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -35,6 +35,30 @@ jobs: - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" displayName: Add conda to PATH + - powershell: | + Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" + $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" + $componentsToRemove= @( + "Microsoft.VisualStudio.Component.VC.ATL" + ) + [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " + $_} + $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache') + # should be run twice + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + - powershell: | + Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" + $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" + $componentsToRemove= @( + "Microsoft.VisualStudio.Component.VC.v141.ATL" + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL" + ) + [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --add " + $_} + $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache') + # should be run twice + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build @@ -49,4 +73,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN)