Skip to content

Commit a29dde8

Browse files
committed
actions: Add Pi 5 support to libcamera-test
Add Pi 5 builds and runs to the nightly tests. Remove the use of camera-bug-report for now. Increase some timeouts. Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
1 parent f2fbc6f commit a29dde8

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/libcamera-apps-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080

8181
strategy:
8282
matrix:
83-
camera: [ imx219, imx477, imx708 ]
83+
camera: [ imx219, imx477, imx708, pi5-imx708-imx477 ]
8484

8585
steps:
8686
- uses: actions/checkout@v3
@@ -107,8 +107,8 @@ jobs:
107107
run: ldd ${{github.workspace}}/build/apps/libcamera-hello | grep libcamera
108108

109109
- name: Test
110-
run: ${{github.workspace}}/utils/camera-bug-report -o ${{github.workspace}}/test_output/bug.txt -t 300 -c "${{github.workspace}}/utils/test.py --exe-dir ${{github.workspace}}/build/apps/ --output-dir ${{github.workspace}}/test_output --json-dir ${{github.workspace}}/assets"
111-
timeout-minutes: 8 # Must be larger than the camera-bug-report timeout.
110+
run: ${{github.workspace}}/utils/test.py --exe-dir ${{github.workspace}}/build/apps/ --output-dir ${{github.workspace}}/test_output --json-dir ${{github.workspace}}/assets
111+
timeout-minutes: 8
112112

113113
- name: Upload test output
114114
if: ${{ failure() }}

.github/workflows/libcamera-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
run: cd ${{env.LIBCAMERA_SRC_DIR}} && git log -1
3131

3232
- name: Setup meson
33-
run: cd ${{env.LIBCAMERA_SRC_DIR}} && meson build -Dprefix=${{env.LIBCAMERA_INSTALL_DIR}} -Dpipelines=rpi/vc4 -Dtest=false
33+
run: cd ${{env.LIBCAMERA_SRC_DIR}} && meson setup build -Dprefix=${{env.LIBCAMERA_INSTALL_DIR}} -Dpipelines=rpi/vc4,rpi/pisp -Dipas=rpi/vc4,rpi/pisp -Dpycamera=enabled -Dtest=false -Dbuildtype=${{env.BUILD_TYPE}} -Dlibpisp:default_library=static
3434

3535
- name: Build
3636
run: cd ${{env.LIBCAMERA_SRC_DIR}}/build && ninja install
37-
timeout-minutes: 10
37+
timeout-minutes: 15
3838

3939
- name: Tar files
4040
run: tar -cvf build-artifacts-libcamera.tar -C ${{env.LIBCAMERA_SRC_DIR}} .
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Build
7777
run: ninja -C ${{github.workspace}}/build
78-
timeout-minutes: 10
78+
timeout-minutes: 15
7979

8080
- name: Tar files
8181
run: tar -cvf build-artifacts-libcamera-apps.tar -C ${{github.workspace}}/build .
@@ -94,7 +94,7 @@ jobs:
9494

9595
strategy:
9696
matrix:
97-
camera: [ imx219, imx477, imx708 ]
97+
camera: [ imx219, imx477, imx708, pi5-imx708-imx477 ]
9898

9999
steps:
100100
- uses: actions/checkout@v3
@@ -133,8 +133,8 @@ jobs:
133133
run: ldd ${{github.workspace}}/build/apps/libcamera-hello | grep libcamera
134134

135135
- name: Test
136-
run: ${{github.workspace}}/utils/camera-bug-report -o ${{github.workspace}}/test_output/bug.txt -t 300 -c "${{github.workspace}}/utils/test.py --exe-dir ${{github.workspace}}/build/apps/ --output-dir ${{github.workspace}}/test_output --json-dir ${{github.workspace}}/assets"
137-
timeout-minutes: 8 # Must be larger than the camera-bug-report timeout.
136+
run: ${{github.workspace}}/utils/test.py --exe-dir ${{github.workspace}}/build/apps/ --output-dir ${{github.workspace}}/test_output --json-dir ${{github.workspace}}/assets
137+
timeout-minutes: 15
138138

139139
- name: Upload test output
140140
if: ${{failure()}}
@@ -151,7 +151,7 @@ jobs:
151151

152152
strategy:
153153
matrix:
154-
camera: [ imx219, imx477, imx708 ]
154+
camera: [ imx219, imx477, imx708, pi5-imx708-imx477 ]
155155

156156
steps:
157157
- name: Clean libcamera LKG
@@ -170,8 +170,8 @@ jobs:
170170
run: tar -xvf build-artifacts-libcamera.tar -C ${{env.LIBCAMERA_SRC_DIR}}
171171

172172
- name: Setup meson
173-
run: cd ${{env.LIBCAMERA_SRC_DIR}} && meson setup build -Dprefix=${{env.LIBCAMERA_LKG_DIR}} -Dpipelines=rpi/vc4 -Dtest=false --wipe
173+
run: cd ${{env.LIBCAMERA_SRC_DIR}} && meson setup build -Dprefix=${{env.LIBCAMERA_LKG_DIR}} -Dpipelines=rpi/vc4,rpi/pisp -Dipas=rpi/vc4,rpi/pisp -Dpycamera=enabled -Dtest=false -Dlibpisp:default_library=static --wipe
174174

175175
- name: Build
176176
run: cd ${{env.LIBCAMERA_SRC_DIR}}/build && ninja install
177-
timeout-minutes: 10
177+
timeout-minutes: 15

0 commit comments

Comments
 (0)