diff --git a/.ci_support/linux_64_ffmpeg6.yaml b/.ci_support/linux_64_ffmpeg6.yaml index a921543..4e11e4b 100644 --- a/.ci_support/linux_64_ffmpeg6.yaml +++ b/.ci_support/linux_64_ffmpeg6.yaml @@ -39,8 +39,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_ffmpeg7.yaml b/.ci_support/linux_64_ffmpeg7.yaml index 89109d8..398e726 100644 --- a/.ci_support/linux_64_ffmpeg7.yaml +++ b/.ci_support/linux_64_ffmpeg7.yaml @@ -39,8 +39,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_ffmpeg6.yaml b/.ci_support/linux_aarch64_ffmpeg6.yaml index c850f52..c379850 100644 --- a/.ci_support/linux_aarch64_ffmpeg6.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6.yaml @@ -43,8 +43,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_ffmpeg7.yaml b/.ci_support/linux_aarch64_ffmpeg7.yaml index d0abc3a..d1aa235 100644 --- a/.ci_support/linux_aarch64_ffmpeg7.yaml +++ b/.ci_support/linux_aarch64_ffmpeg7.yaml @@ -43,8 +43,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_ppc64le_ffmpeg6.yaml b/.ci_support/linux_ppc64le_ffmpeg6.yaml index 26b09f8..e0459f4 100644 --- a/.ci_support/linux_ppc64le_ffmpeg6.yaml +++ b/.ci_support/linux_ppc64le_ffmpeg6.yaml @@ -39,8 +39,6 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_ppc64le_ffmpeg7.yaml b/.ci_support/linux_ppc64le_ffmpeg7.yaml index bf1f4f6..9a3ee65 100644 --- a/.ci_support/linux_ppc64le_ffmpeg7.yaml +++ b/.ci_support/linux_ppc64le_ffmpeg7.yaml @@ -39,8 +39,6 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_ffmpeg6.yaml b/.ci_support/osx_64_ffmpeg6.yaml index b29ac9f..f81ede5 100644 --- a/.ci_support/osx_64_ffmpeg6.yaml +++ b/.ci_support/osx_64_ffmpeg6.yaml @@ -41,8 +41,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_ffmpeg7.yaml b/.ci_support/osx_64_ffmpeg7.yaml index 04a3e47..d9fe047 100644 --- a/.ci_support/osx_64_ffmpeg7.yaml +++ b/.ci_support/osx_64_ffmpeg7.yaml @@ -41,8 +41,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_ffmpeg6.yaml b/.ci_support/osx_arm64_ffmpeg6.yaml index d9abf8a..e7638e5 100644 --- a/.ci_support/osx_arm64_ffmpeg6.yaml +++ b/.ci_support/osx_arm64_ffmpeg6.yaml @@ -40,8 +40,8 @@ python: - 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_ffmpeg7.yaml b/.ci_support/osx_arm64_ffmpeg7.yaml index b6e1766..126a93b 100644 --- a/.ci_support/osx_arm64_ffmpeg7.yaml +++ b/.ci_support/osx_arm64_ffmpeg7.yaml @@ -40,8 +40,8 @@ python: - 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/win_64_ffmpeg6.yaml b/.ci_support/win_64_ffmpeg6.yaml index 688f0cf..a094ccd 100644 --- a/.ci_support/win_64_ffmpeg6.yaml +++ b/.ci_support/win_64_ffmpeg6.yaml @@ -29,8 +29,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/win_64_ffmpeg7.yaml b/.ci_support/win_64_ffmpeg7.yaml index bf0cc7d..93a97be 100644 --- a/.ci_support/win_64_ffmpeg7.yaml +++ b/.ci_support/win_64_ffmpeg7.yaml @@ -29,8 +29,8 @@ python: - 3.8.* *_cpython - 3.9.* *_73_pypy - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..a5836e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,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 07dff21..ba0c879 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 6d54697..65650bf 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/recipe/meta.yaml b/recipe/meta.yaml index e71889e..a5fd435 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ source: - 3109bis.patch build: - number: 5 + number: 6 outputs: - name: {{ namecxx }} @@ -65,7 +65,7 @@ outputs: - libedit # [not win] - libopencv - portaudio - - qt-main + - qt6-main # [not ppc64le] - ffmpeg run: @@ -85,6 +85,12 @@ outputs: - if not exist %PREFIX%\\Library\\lib\\YARP_os.lib exit 1 # [win] - if not exist %PREFIX%\\Library\\bin\\YARP_os.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\lib\\cmake\\YARP_os\\YARP_osConfig.cmake exit 1 # [win] + - yarpmanager --help # [not ppc64le] + - yarprobotinterface --help # [not ppc64le] + - yarpaudiocontrolgui --help # [not ppc64le] + - yarpmobilebasegui --help # [not ppc64le] + - yarpmotorgui --help # [not ppc64le] + - yarpscope --help # [not ppc64le] - name: {{ namepython }} script: build_py.sh # [unix]