Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions .github/workflows/clang-tidy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,49 +103,6 @@ jobs:
ninja -C buildDir install
ls -laR $LIBCAMERA_STAGING

- name: Cache filament
id: cache-filament-1-65-2
uses: actions/cache@v4
with:
key: ${{ runner.os }}-filament-1-65-2
path: |
${{github.workspace}}/filament/cmake-build-release/staging/release/*

- name: Build Filament
if: steps.cache-filament-1-65-2.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}
run: |
git clone -b release https://github.com/google/filament.git
cd filament
git checkout v1.65.2
PATCHES=${{github.workspace}}/.github/workflows/patches
git apply $PATCHES/filament/0001-disable-backend-tests-1.65.2.patch
git apply $PATCHES/filament/0002-install-required-files.patch
git apply $PATCHES/filament/0003-move-include-contents-to-include-filament.patch
git apply $PATCHES/filament/0004-move-libraries-so-they-install-1.65.2.patch
git apply $PATCHES/filament/0005-spirv-tools-threads.patch
FILAMENT_BUILD_DIR=$PWD/cmake-build-release
FILAMENT_STAGING_DIR=${FILAMENT_BUILD_DIR}/staging/release
mkdir -p $FILAMENT_BUILD_DIR
cd $FILAMENT_BUILD_DIR
CC=/usr/bin/clang CXX=/usr/bin/clang++ \
cmake .. -GNinja \
-DFILAMENT_SUPPORTS_VULKAN=ON \
-DFILAMENT_ENABLE_LTO=OFF \
-DFILAMENT_SUPPORTS_OPENGL=OFF \
-DFILAMENT_USE_EXTERNAL_GLES3=OFF \
-DFILAMENT_SUPPORTS_WAYLAND=ON \
-DFILAMENT_SUPPORTS_X11=OFF \
-DFILAMENT_SUPPORTS_XCB=OFF \
-DFILAMENT_SUPPORTS_EGL_ON_LINUX=OFF \
-DFILAMENT_SKIP_SDL2=ON \
-DFILAMENT_SKIP_SAMPLES=ON \
-DFILAMENT_USE_SWIFTSHADER=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_STAGING_PREFIX=${FILAMENT_STAGING_DIR} \
-DCMAKE_BUILD_TYPE=Release
ninja -C . install

- name: Configure CMake
working-directory: ${{github.workspace}}
run: |
Expand Down Expand Up @@ -176,9 +133,6 @@ jobs:
-D BUILD_PLUGIN_COMP_REGION=OFF \
-D BUILD_PLUGIN_COMP_SURF=OFF \
-D BUILD_PLUGIN_DESKTOP_WINDOW_LINUX=ON \
-D BUILD_PLUGIN_FILAMENT_VIEW=ON \
-D FILAMENT_INCLUDE_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/include \
-D FILAMENT_LINK_LIBRARIES_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/lib/x86_64 \
-D BUILD_PLUGIN_FILE_SELECTOR=ON \
-D BUILD_PLUGIN_FIREBASE_AUTH=OFF \
-D BUILD_PLUGIN_FIREBASE_CORE=OFF \
Expand Down Expand Up @@ -225,9 +179,6 @@ jobs:
-warnings-as-errors='*,-bugprone-macro-parentheses' \
-export-fixes=tidy-results-suggested-fixes.txt \
-extra-arg='-I${{github.workspace}}/ivi-homescreen/build/third_party/waypp/waypp/protocols' \
-extra-arg='-I${{github.workspace}}/filament/cmake-build-release/staging/release/include' \
-extra-arg='-I${{github.workspace}}/filament/cmake-build-release/staging/release/include/filament' \
-extra-arg='-I${{github.workspace}}/filament/lib/utils/include' \
$FILE_LIST > tidy-results-log.txt

- name: Show results
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,50 +141,6 @@ jobs:
ninja -C buildDir install
ls -laR $LIBCAMERA_STAGING

- name: Cache filament
id: cache-filament
uses: actions/cache@v4
with:
key: ${{ runner.os }}-filament
path: |
${{github.workspace}}/filament/cmake-build-release/staging/release/*

- name: Build Filament
if: steps.cache-filament.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}
run: |
git clone -b release https://github.com/google/filament.git
cd filament
git checkout v1.56.7
PATCHES=${{github.workspace}}/.github/workflows/patches
git apply $PATCHES/filament/0001-disable-backend-tests.patch
git apply $PATCHES/filament/0002-install-required-files.patch
git apply $PATCHES/filament/0003-move-include-contents-to-include-filament.patch
git apply $PATCHES/filament/0004-move-libraries-so-they-install.patch
git apply $PATCHES/filament/0005-return-shader-type-mobile-for-linux-vulkan.patch

FILAMENT_BUILD_DIR=$PWD/cmake-build-release
FILAMENT_STAGING_DIR=${FILAMENT_BUILD_DIR}/staging/release
mkdir -p $FILAMENT_BUILD_DIR
cd $FILAMENT_BUILD_DIR
CC=/usr/bin/clang CXX=/usr/bin/clang++ \
cmake .. -GNinja \
-DFILAMENT_SUPPORTS_VULKAN=ON \
-DFILAMENT_ENABLE_LTO=ON \
-DFILAMENT_SUPPORTS_OPENGL=OFF \
-DFILAMENT_USE_EXTERNAL_GLES3=OFF \
-DFILAMENT_SUPPORTS_WAYLAND=ON \
-DFILAMENT_SUPPORTS_X11=OFF \
-DFILAMENT_SUPPORTS_XCB=OFF \
-DFILAMENT_SUPPORTS_EGL_ON_LINUX=OFF \
-DFILAMENT_SKIP_SDL2=ON \
-DFILAMENT_SKIP_SAMPLES=ON \
-DFILAMENT_USE_SWIFTSHADER=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_STAGING_PREFIX=${FILAMENT_STAGING_DIR} \
-DCMAKE_BUILD_TYPE=Release
ninja -C . install

- name: Configure
run: |
find /usr -iname "llvm-config*"
Expand Down Expand Up @@ -214,9 +170,6 @@ jobs:
-D BUILD_PLUGIN_COMP_REGION=OFF \
-D BUILD_PLUGIN_COMP_SURF=OFF \
-D BUILD_PLUGIN_DESKTOP_WINDOW_LINUX=ON \
-D BUILD_PLUGIN_FILAMENT_VIEW=ON \
-D FILAMENT_INCLUDE_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/include \
-D FILAMENT_LINK_LIBRARIES_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/lib/x86_64 \
-D BUILD_PLUGIN_FILE_SELECTOR=ON \
-D BUILD_PLUGIN_FIREBASE_AUTH=OFF \
-D BUILD_PLUGIN_FIREBASE_CORE=OFF \
Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/ivi-homescreen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,49 +101,6 @@ jobs:
ninja -C buildDir install
ls -laR $LIBCAMERA_STAGING

- name: Cache filament
id: cache-filament-1-65-2
uses: actions/cache@v4
with:
key: ${{ runner.os }}-filament-1-65-2
path: |
${{github.workspace}}/filament/cmake-build-release/staging/release/*

- name: Build Filament
if: steps.cache-filament-1-65-2.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}
run: |
git clone -b release https://github.com/google/filament.git
cd filament
git checkout v1.65.2
PATCHES=${{github.workspace}}/.github/workflows/patches
git apply $PATCHES/filament/0001-disable-backend-tests-1.65.2.patch
git apply $PATCHES/filament/0002-install-required-files.patch
git apply $PATCHES/filament/0003-move-include-contents-to-include-filament.patch
git apply $PATCHES/filament/0004-move-libraries-so-they-install-1.65.2.patch
git apply $PATCHES/filament/0005-spirv-tools-threads.patch
FILAMENT_BUILD_DIR=$PWD/cmake-build-release
FILAMENT_STAGING_DIR=${FILAMENT_BUILD_DIR}/staging/release
mkdir -p $FILAMENT_BUILD_DIR
cd $FILAMENT_BUILD_DIR
CC=/usr/bin/clang CXX=/usr/bin/clang++ \
cmake .. -GNinja \
-DFILAMENT_SUPPORTS_VULKAN=ON \
-DFILAMENT_ENABLE_LTO=OFF \
-DFILAMENT_SUPPORTS_OPENGL=OFF \
-DFILAMENT_USE_EXTERNAL_GLES3=OFF \
-DFILAMENT_SUPPORTS_WAYLAND=ON \
-DFILAMENT_SUPPORTS_X11=OFF \
-DFILAMENT_SUPPORTS_XCB=OFF \
-DFILAMENT_SUPPORTS_EGL_ON_LINUX=OFF \
-DFILAMENT_SKIP_SDL2=ON \
-DFILAMENT_SKIP_SAMPLES=ON \
-DFILAMENT_USE_SWIFTSHADER=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_STAGING_PREFIX=${FILAMENT_STAGING_DIR} \
-DCMAKE_BUILD_TYPE=Release
ninja -C . install

- name: Configure Debug
run: |
mkdir -p ${{github.workspace}}/build/debug
Expand Down Expand Up @@ -177,9 +134,6 @@ jobs:
-D BUILD_PLUGIN_COMP_REGION=OFF \
-D BUILD_PLUGIN_COMP_SURF=OFF \
-D BUILD_PLUGIN_DESKTOP_WINDOW_LINUX=ON \
-D BUILD_PLUGIN_FILAMENT_VIEW=ON \
-D FILAMENT_INCLUDE_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/include \
-D FILAMENT_LINK_LIBRARIES_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/lib/x86_64 \
-D BUILD_PLUGIN_FILE_SELECTOR=ON \
-D BUILD_PLUGIN_FIREBASE_AUTH=OFF \
-D BUILD_PLUGIN_FIREBASE_CORE=OFF \
Expand Down Expand Up @@ -254,9 +208,6 @@ jobs:
-D BUILD_PLUGIN_COMP_REGION=OFF \
-D BUILD_PLUGIN_COMP_SURF=OFF \
-D BUILD_PLUGIN_DESKTOP_WINDOW_LINUX=ON \
-D BUILD_PLUGIN_FILAMENT_VIEW=ON \
-D FILAMENT_INCLUDE_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/include \
-D FILAMENT_LINK_LIBRARIES_DIR=${{github.workspace}}/filament/cmake-build-release/staging/release/lib/x86_64 \
-D BUILD_PLUGIN_FILE_SELECTOR=ON \
-D BUILD_PLUGIN_FIREBASE_AUTH=OFF \
-D BUILD_PLUGIN_FIREBASE_CORE=OFF \
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading