Skip to content

Commit 36bf807

Browse files
committed
Fix package build path.
1 parent 9db0b15 commit 36bf807

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/raspberry_pi.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ jobs:
3939
# cortex-a7 -> RPi 3+, if we need 1,2,zero, needs to use arm1176
4040
# see: https://github.com/marketplace/actions/arm-runner
4141
# adapted from: https://github.com/castle-engine/castle-engine/blob/master/.github/workflows/test-and-pack-arm-runner.yml
42-
- {name: "rpi-armv71", os: "raspios_lite:latest", arch: "armv71", cpu: "cortex-a7", cmake_extra: "-DLSL_UNITTESTS=ON -DLSL_BENCHMARKS=ON" }
43-
- {name: "rpi-aarch64", os: "raspios_lite_arm64:latest", arch: "aarch64", cpu: "cortex-a53", cmake_extra: "-DLSL_UNITTESTS=ON -DLSL_BENCHMARKS=ON" }
42+
- {name: "rpi-armv7l", os: "raspios_lite:latest", cpu: "cortex-a7", cpu_info: "cpuinfo/raspberrypi_3b", cmake_extra: "-DLSL_UNITTESTS=ON -DLSL_BENCHMARKS=ON" }
43+
- {name: "rpi-aarch64", os: "raspios_lite_arm64:latest", cpu: "cortex-a53", cpu_info: "cpuinfo/raspberrypi_4b", cmake_extra: "-DLSL_UNITTESTS=ON -DLSL_BENCHMARKS=ON" }
4444
steps:
4545
- uses: actions/checkout@v5
4646
- uses: pguyot/arm-runner-action@v2
4747
with:
4848
base_image: ${{ matrix.config.os }}
49-
arch: ${{ matrix.config.arch }}
5049
cpu: ${{ matrix.config.cpu }}
50+
cpu_info: ${{ matrix.config.cpu_info }}
5151
shell: /bin/bash -eo pipefail
5252
image_additional_mb: 1024
5353
bind_mount_repository: true
@@ -87,11 +87,11 @@ jobs:
8787
cmake --build build --target package --config Release -j
8888
echo $PWD
8989
ls -la
90-
cmake -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON .
91-
sudo dpkg -i package/*.deb
92-
cmake --build build --target package --config Release -j
93-
dpkg -I package/liblsl*.deb
94-
cmake -E remove_directory package/_CPack_Packages
90+
cmake -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON .
91+
sudo dpkg -i package/*.deb
92+
cmake --build build --target package --config Release -j
93+
dpkg -I build/liblsl*.deb
94+
cmake -E remove_directory build/_CPack_Packages
9595
cp testing/lslcfgs/default.cfg .
9696
9797
- name: upload install dir

0 commit comments

Comments
 (0)