CI: update CI

to build system reference applications instead of deprecated application Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
arnopo · Sep 23, 2024 · c073ee7 · c073ee7
1 parent c468328
commit c073ee7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/.github/actions/build_ci/entrypoint.sh b/.github/actions/build_ci/entrypoint.sh
@@ -31,22 +31,28 @@ pre_build(){
 build_linux(){
 	echo  " Build for linux"
 	apt-get install -y libsysfs-dev libhugetlbfs-dev gcc || exit 1
-	export || exit 1
-	pwd || exit 1
-	ls -l || exit 1
-	cd libmetal || exit 1
-	cmake . -Bbuild \
-	-DCMAKE_C_FLAGS="-Werror -Wall -Wextra -Wshadow -Wunused-but-set-variable" || exit 1
-	cd build || exit 1
-	make || exit 1
-	export || exit 1
-	cd ../.. || exit 1
-	cmake . -Bbuild -DCMAKE_C_FLAGS="-Werror -Wall -Wextra -Wshadow -Wunused-but-set-variable" \
-	-DWITH_APPS=on -DWITH_PROXY=on -DCMAKE_INCLUDE_PATH="./libmetal/build/lib/include"  \
-	-DCMAKE_LIBRARY_PATH="./libmetal/build/lib" || exit 1
-	cd build || exit 1
-	make VERBOSE=1 all || exit 1
-	exit 0
+	export PROJECT_ROOT=$PWD
+	#Build libmetal
+	cd $PROJECT_ROOT/libmetal &&
+	cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=$PROJECT_ROOT/target \
+		-DCMAKE_C_FLAGS="-Werror -Wall -Wextra -Wshadow -Wunused-but-set-variable" || exit 1
+	make -C build VERBOSE=1 install || exit 1
+	#Build open_amp
+	cd $PROJECT_ROOT/open-amp &&
+	cmake . -Bbuild -DCMAKE_INCLUDE_PATH=$PROJECT_ROOT/libmetal/build/lib/include/ \
+		-DCMAKE_LIBRARY_PATH=$PROJECT_ROOT/libmetal/build/lib/ \
+		-DCMAKE_INSTALL_PREFIX=$PROJECT_ROOT/target \
+		-DCMAKE_C_FLAGS="-Werror -Wall -Wextra -Wshadow -Wunused-but-set-variable" || exit 1
+	make -C build VERBOSE=1 install || exit 1
+	#Build legacy Apps
+	cd $PROJECT_ROOT/openamp-system-reference/examples/legacy_apps
+	cmake -Bbuild \
+		-DCMAKE_INCLUDE_PATH="$PROJECT_ROOT/libmetal/build/lib/include/;$PROJECT_ROOT/open-amp/build/lib/include/" \
+		-DCMAKE_LIBRARY_PATH="$PROJECT_ROOT/libmetal/build/lib/;$PROJECT_ROOT/open-amp/build/lib/" \
+		-DCMAKE_INSTALL_PREFIX=$PROJECT_ROOT/target \
+		-DCMAKE_C_FLAGS="-Werror -Wall -Wextra -Wshadow -Wunused-but-set-variable" || exit 1
+	make -C build VERBOSE=1 install || exit 1
+  	exit 0
 }
 
 build_generic(){

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -23,12 +23,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout open-amp
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Checkout libmetal
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: OpenAMP/libmetal
         path: libmetal
+    - name: Checkout openamp-system-reference
+      uses: actions/checkout@v4
+      with:
+        repository: OpenAMP/openamp-system-reference
+        path: openamp-system-reference
     - name: build for Linux
       id: build_linux
       uses: ./.github/actions/build_ci