From e53effd2a11a5001e08b70ffd8f3ddca880f90a7 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 13:05:46 -0300 Subject: [PATCH 1/3] fix rpi install libs --- scripts/dev/download_libs.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index 40d64c79b9d..aa768286984 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -358,7 +358,20 @@ for PKG in $PKGS; do unzip -qo download/$PKG # rm -r download/$PKG else - tar xjf download/$PKG + + # FIXME: this if can be removed after this is fixed properly on apothecary, see: + # https://github.com/openframeworks/openFrameworks/issues/8206 + + if [ "$PLATFORM" == "linux" && ( + [ "$ARCH" == "aarch64" ] || + [ "$ARCH" == "armv7l" ] || + [ "$ARCH" == "armv6l" ] + ) ]; then + echo "tar xjfv download/$PKG --strip-components=1" + tar xjf download/$PKG --strip-components=1 + else + tar xjfv download/$PKG + fi # rm -r download/$PKG fi echo " Deployed libraries from [download/$PKG] to [/libs]" From 625d24f5d65db63298005dd498413872a1dcf358 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 13:11:23 -0300 Subject: [PATCH 2/3] fix script --- scripts/dev/download_libs.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index aa768286984..b7b19762a29 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -362,11 +362,7 @@ for PKG in $PKGS; do # FIXME: this if can be removed after this is fixed properly on apothecary, see: # https://github.com/openframeworks/openFrameworks/issues/8206 - if [ "$PLATFORM" == "linux" && ( - [ "$ARCH" == "aarch64" ] || - [ "$ARCH" == "armv7l" ] || - [ "$ARCH" == "armv6l" ] - ) ]; then + if [ "$PLATFORM" == "linux" && [ [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "armv7l" ] || [ "$ARCH" == "armv6l" ] ] ]; then echo "tar xjfv download/$PKG --strip-components=1" tar xjf download/$PKG --strip-components=1 else From be580ea13e5aa8622d7976485c04c4379b6124f0 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 13:22:01 -0300 Subject: [PATCH 3/3] add ls to msys actions --- .github/workflows/of.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 0b061e34b39..5959e1063ec 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -101,6 +101,10 @@ jobs: - name: Install dependencies run: ./scripts/ci/msys2/install.sh --msystem=${{ matrix.msystem }} + - name: LS + shell: bash + run: ls -alfR + - name: Build run: ./scripts/ci/msys2/build.sh