From 9d41ea72fe43bb301e7a210f87cd18aeda8083aa Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 14 Mar 2025 09:15:56 +0100 Subject: [PATCH 1/3] [ci,alt-arch] request sudo for package installation --- .github/workflows/alt-architectures.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/alt-architectures.yml b/.github/workflows/alt-architectures.yml index 8afce3cf9..5e09d6133 100644 --- a/.github/workflows/alt-architectures.yml +++ b/.github/workflows/alt-architectures.yml @@ -40,7 +40,7 @@ jobs: apt-get install -q -y devscripts clang ninja-build ccache equivs run: | ./packaging/scripts/prepare_deb_freerdp-nightly.sh - mk-build-deps -i + sudo mk-build-deps -i cmake -GNinja \ -C ci/cmake-preloads/config-linux-alt-arch.txt \ -B ci-build \ From e0a82e7ab30739d86381fa0bb80ba3f00b1a2018 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 14 Mar 2025 09:51:37 +0100 Subject: [PATCH 2/3] [ci,clang-tidy] use own fork --- .github/workflows/clang-tidy-post.yml | 2 +- .github/workflows/clang-tidy.yml | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/clang-tidy-post.yml b/.github/workflows/clang-tidy-post.yml index 742cee590..492e442b9 100644 --- a/.github/workflows/clang-tidy-post.yml +++ b/.github/workflows/clang-tidy-post.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: ZedThree/clang-tidy-review/post@v0.19.0 + - uses: akallabeth/clang-tidy-review/post@master # lgtm_comment_body, max_comments, and annotations need to be set on the posting workflow in a split setup with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index c495c8fb5..5086b55e4 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -10,24 +10,19 @@ jobs: steps: - uses: actions/checkout@v4 - - name: "Install dependencies" - run: | - sudo apt-get update -q -y - sudo apt-get install -q -y devscripts clang ccache ninja-build equivs - ./packaging/scripts/prepare_deb_freerdp-nightly.sh - sudo mk-build-deps -i - # Run clang-tidy - - uses: ZedThree/clang-tidy-review@v0.19.0 + - uses: akallabeth/clang-tidy-review@master id: review with: split_workflow: true clang_tidy_checks: '' + apt_packages: devscripts,equivs + install_commands: 'ln -s packaging/deb/freerdp-nightly debian; mk-build-deps -i -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y"' # CMake command to run in order to generate compile_commands.json build_dir: tidy - cmake_command: cmake -Btidy -S. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWITH_DEBUG_ALL=ON -DWITH_INTERNAL_MD4=ON -DWITH_INTERNAL_MD5=ON -DWITH_INTERNAL_RC4=ON -DBUILD_TESTING=ON -DWINPR_UTILS_IMAGE_JPEG=ON -DWINPR_UTILS_IMAGE_PNG=ON -DWINPR_UTILS_IMAGE_WEBP=ON -DWITH_BINARY_VERSIONING=ON -DWITH_CAIRO=ON -DWITH_DSP_EXPERIMENTAL=ON -DWITH_FAAC=ON -DWITH_FAAD2=ON -DWITH_FREERDP_DEPRECATED=ON -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON -DWITH_GSM=ON -DWITH_OPUS=ON -DWITH_PROXY_EMULATE_SMARTCARD=ON -DWITH_PULSE=ON -DWITH_SMARTCARD_INSPECT=ON -DWITH_SOXR=ON -DWITH_UNICODE_BUILTIN=ON -DWITH_VAAPI=ON -DWITH_WINPR_DEPRECATED=ON -DWITH_SDL_IMAGE_DIALOGS=ON -DWITH_PROFILER=ON -DWITH_OPENCL=ON -DCHANNEL_TSMF=ON -DWITH_WEBVIEW=OFF + cmake_command: cmake -Btidy -S. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -C ci/cmake-preloads/config-qa.cmake # Uploads an artefact containing clang_fixes.json - - uses: ZedThree/clang-tidy-review/upload@v0.19.0 + - uses: akallabeth/clang-tidy-review/upload@master id: upload-review From d7f8e5081231b9c632827655b8e4090cb72d3afc Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 14 Mar 2025 10:50:02 +0100 Subject: [PATCH 3/3] [ci,nightly] add opencl dependencies to debian nightly --- packaging/deb/freerdp-nightly/control | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index 786bfd0df..380e2e201 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -63,6 +63,10 @@ Build-Depends: libjpeg-dev, opensc-pkcs11, libv4l-dev, + ocl-icd-dev, + ocl-icd-opencl-dev, + opencl-headers, + opencl-c-headers, libasan5 | libasan6 | libasan8 Standards-Version: 3.9.5 Homepage: http://www.freerdp.com/