test

analogdevicesinc · Apr 11, 2024 · dcf43da · dcf43da
1 parent 5bccbe0
commit dcf43da
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/kuiperbuild.yml b/.github/workflows/kuiperbuild.yml
@@ -23,9 +23,25 @@ jobs:
           shell: bash
           run: |
                 sudo chown -R 1000:1000 $GITHUB_WORKSPACE
+
+                set "BUILD_HOST=ubuntu-20.04"
+                set "USERNAME=runner"
+
                 docker run \
                         --mount type=bind,source="$GITHUB_WORKSPACE",target=/home/runner/scopy \
-                        cristianbindea/scopy2-kuiper:latest /bin/bash -c 'id && cd /home/runner/scopy && ./ci/kuiper/kuiper_build_process.sh install_packages download_cmake download_crosscompiler move_sysroot build_scopy build_iio-emu create_appdir create_appimage move_appimage'
+                        -e BUILD_HOST=$BUILD_HOST \
+                        -e USERNAME=$USERNAME \
+                        -e GITHUB_SERVER_URL=$GITHUB_SERVER_URL \
+                        -e GITHUB_API_URL=$GITHUB_API_URL \
+                        -e GITHUB_RUN_ID=$GITHUB_RUN_ID \
+                        -e GITHUB_RUN_NUMBER=$GITHUB_RUN_NUMBER \
+                        -e GITHUB_JOB=$GITHUB_JOB \
+                        -e RUNNER_ARCH=$RUNNER_ARCH \
+                        -e SHELL="/bin/bash" \
+                        cristianbindea/scopy2-kuiper:latest \
+                        /bin/bash -c    ' sudo chown $USERNAME:$USERNAME -R /home/runner/scopy && \
+                                        cd /home/runner/scopy && \
+                                        ./ci/kuiper/kuiper_build_process.sh install_packages download_cmake download_crosscompiler move_sysroot build_scopy build_iio-emu create_appdir create_appimage move_appimage'
 
         - name: Set short git commit SHA
           shell: bash

diff --git a/ci/kuiper/copy-deps.sh b/ci/kuiper/copy-deps.sh
@@ -9,27 +9,13 @@ LOCATION=$2
 
 
 if [ ! -f "${SRC_DIR}"/ci/kuiper/ldd-mod ]; then
-	ls /usr/arm-linux-gnueabihf/lib
-	ls /usr/arm-linux-gnueabihf/lib/ld-2.31.so
-	ls /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3
 	sed 's|.*RTLDLIST=.*|RTLDLIST="/usr/arm-linux-gnueabihf/lib/ld-2.31.so /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3"|' /usr/bin/ldd | tee "${SRC_DIR}"/ci/kuiper/ldd-mod
 	chmod +x "${SRC_DIR}"/ci/kuiper/ldd-mod
 fi
 
 export LD_LIBRARY_PATH="${APP_DIR}/usr/lib:${SYSROOT}/lib:${SYSROOT}/lib/arm-linux-gnueabihf:${SYSROOT}/usr/arm-linux-gnueabihf/lib:${SYSROOT}/usr/local/qt5.15/lib:${SYSROOT}/usr/local/lib:${SRC_DIR}/build"
 LIBS_ARRAY=()
 run_ldd(){
-
-	if [ ! -z "$(${SRC_DIR}/ci/kuiper/ldd-mod $1 | grep "not found")" ]; then
-		echo "--- LIB NOT FOUND"
-		${SRC_DIR}/ci/kuiper/ldd-mod $1
-		exit 1
-	fi
-	if [ ! -z "$(${SRC_DIR}/ci/kuiper/ldd-mod $1 | grep "not a dynamic executable")" ]; then
-		echo "--- LDD ERROR"
-		exit 1
-	fi
-
 	for library in $("${SRC_DIR}"/ci/kuiper/ldd-mod "$1" | cut -d '>' -f 2 | awk '{print $1}')
 	do
 		# check if the library exists at that path and if it was processed already