test

analogdevicesinc · Apr 12, 2024 · f69d430 · f69d430
1 parent 5bccbe0
commit f69d430
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/kuiperbuild.yml b/.github/workflows/kuiperbuild.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   BUILD_HOST: ubuntu-20.04
-  USERNAME: runner
+  USERNAME: github-actions
 
 jobs:
 
@@ -19,14 +19,21 @@ jobs:
         - name: Pull the Docker Image
           run: docker pull cristianbindea/scopy2-kuiper:latest
 
-        - name: Build Scopy
+        - name: Create Scopy AppImage
           shell: bash
           run: |
-                sudo chown -R 1000:1000 $GITHUB_WORKSPACE
-                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'
+                cd $GITHUB_WORKSPACE
+                ./ci/kuiper/create_sysroot.sh install_packages install_qemu
 
+                docker run \
+                        --mount type=bind,source="$GITHUB_WORKSPACE",target=$HOME/scopy \
+                        --env-file $GITHUB_WORKSPACE/ci/general/gh-actions.envs \
+                        cristianbindea/scopy2-kuiper:latest \
+                        /bin/bash -c    'cd $HOME && \
+                                        sudo chown -R runner:runner scopy && \
+                                        cd $HOME/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
           run: echo "commit_sha=$(git rev-parse --short ${{ github.sha }})" >> "$GITHUB_ENV"

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

diff --git a/ci/kuiper/kuiper_build_process.sh b/ci/kuiper/kuiper_build_process.sh
@@ -18,6 +18,7 @@ build_with_cmake() {
 	$CMAKE $CURRENT_BUILD_CMAKE_OPTS ../
 	make $JOBS
 	CURRENT_BUILD_CMAKE_OPTS=""
+	# TODO: Create build-status file
 }
 
 set_config_opts() {