CI: Update open-amp path

To have a coherent directory hierarchy, move the open-amp git from root to the "./open-amp" directory. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
OpenAMP · Oct 17, 2024 · 4cb6885 · 4cb6885
1 parent 7bd625a
commit 4cb6885
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/.github/actions/build_ci/entrypoint.sh b/.github/actions/build_ci/entrypoint.sh
@@ -31,19 +31,20 @@ pre_build(){
 build_linux(){
 	echo  " Build for linux"
 	apt-get install -y libsysfs-dev libhugetlbfs-dev gcc || exit 1
+	export PROJECT_ROOT=$PWD
 	export || exit 1
 	pwd || exit 1
 	ls -l || exit 1
-	cd libmetal || exit 1
+	cd $PROJECT_ROOT/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
+	cd $PROJECT_ROOT/open-amp || 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
+	-DWITH_APPS=on -DWITH_PROXY=on -DCMAKE_INCLUDE_PATH="$PROJECT_ROOT/libmetal/build/lib/include"  \
+	-DCMAKE_LIBRARY_PATH="$PROJECT_ROOT/libmetal/build/lib" || exit 1
 	cd build || exit 1
 	make VERBOSE=1 all || exit 1
 	exit 0
@@ -52,17 +53,18 @@ build_linux(){
 build_generic(){
 	echo  " Build for generic platform "
 	apt-get install -y gcc-arm-none-eabi || exit 1
-	cd libmetal || exit 1
+	export PROJECT_ROOT=$PWD
+	cd $PROJECT_ROOT/libmetal || exit 1
 	cmake . -Bbuild-generic -DCMAKE_TOOLCHAIN_FILE=template-generic \
 	-DCMAKE_C_FLAGS="-Werror -Wall -Wextra -Wshadow -Wunused-but-set-variable" || exit 1
 	cd build-generic || exit 1
 	make VERBOSE=1 || exit 1
-	cd ../../ || exit 1
+	cd $PROJECT_ROOT/open-amp || exit 1
 	cmake . -Bbuild-generic -DCMAKE_TRY_COMPILE_TARGET_TYPE="STATIC_LIBRARY" \
 	-DCMAKE_C_FLAGS="-Werror -Wall -Wextra -Wshadow -Wunused-but-set-variable" \
 	-DCMAKE_SYSTEM_PROCESSOR="arm" -DCMAKE_C_COMPILER=arm-none-eabi-gcc \
-	-DCMAKE_INCLUDE_PATH="./libmetal/build-generic/lib/include" \
-	-DCMAKE_LIBRARY_PATH="./libmetal/build-generic/lib" || exit 1
+	-DCMAKE_INCLUDE_PATH="$PROJECT_ROOT/libmetal/build-generic/lib/include" \
+	-DCMAKE_LIBRARY_PATH="$PROJECT_ROOT/libmetal/build-generic/lib" || exit 1
 	cd build-generic || exit 1
 	make VERBOSE=1 || exit 1
 	exit 0
@@ -89,6 +91,7 @@ build_zephyr(){
 	sudo apt-get install -y libc6-dev-i386 gperf g++ python3-ply python3-yaml device-tree-compiler ncurses-dev uglifyjs -qq || exit 1
 	pip3 install west || exit 1
 
+	export PROJECT_ROOT=$PWD
 	wget $ZEPHYR_SDK_DOWNLOAD_URL || exit 1
 	tar xvf $ZEPHYR_SDK_SETUP_TAR || exit 1
 	rm -rf $ZEPHYR_SDK_INSTALL_DIR || exit 1
@@ -100,11 +103,11 @@ build_zephyr(){
 	pip3 install  -r ./zephyr/scripts/requirements.txt || exit 1
 	echo  "Update zephyr OpenAMP repos"
 	#Update zephyr OpenAMP repos
-	cp -r ../lib modules/lib/open-amp/open-amp/ || exit 1
-	cp ../CMakeLists.txt modules/lib/open-amp/open-amp/ || exit 1
-	cp ../VERSION modules/lib/open-amp/open-amp/ || exit 1
-	cp -r ../cmake modules/lib/open-amp/open-amp/ || exit 1
-	cp -r ../libmetal modules/hal/libmetal/ || exit 1
+	cp -r $PROJECT_ROOT/open-amp/lib modules/lib/open-amp/open-amp/ || exit 1
+	cp $PROJECT_ROOT/open-amp/CMakeLists.txt modules/lib/open-amp/open-amp/ || exit 1
+	cp $PROJECT_ROOT/open-amp/VERSION modules/lib/open-amp/open-amp/ || exit 1
+	cp -r $PROJECT_ROOT/open-amp/cmake modules/lib/open-amp/open-amp/ || exit 1
+	cp -r $PROJECT_ROOT/libmetal modules/hal/libmetal/ || exit 1
 	cd ./zephyr || exit 1
 	source zephyr-env.sh || exit 1
 	echo  "build openamp sample"

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -24,23 +24,25 @@ jobs:
     steps:
     - name: Checkout open-amp
       uses: actions/checkout@v4
+      with:
+        path: open-amp
     - name: Checkout libmetal
       uses: actions/checkout@v4
       with:
         repository: OpenAMP/libmetal
         path: libmetal
     - name: build for Linux
       id: build_linux
-      uses: ./.github/actions/build_ci
+      uses: ./open-amp/.github/actions/build_ci
       with:
         target: linux
     - name: build for Zephyr
       id: build_Zephyr
-      uses: ./.github/actions/build_ci
+      uses: ./open-amp/.github/actions/build_ci
       with:
         target: zephyr
     - name: build for generic arm
       id: build_generic
-      uses: ./.github/actions/build_ci
+      uses: ./open-amp/.github/actions/build_ci
       with:
         target: generic