Skip to content

Commit

Permalink
CI: Don't cd into build directory
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewbird committed Dec 8, 2023
1 parent 9cb1725 commit bed46e0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
8 changes: 4 additions & 4 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ else
pipx install meson
export PATH=${HOME}/.local/bin:${PATH}

mkdir build
cd build || (echo "Could not switch into build dir" && exit 1)
PREFIX=${INST} ../configure.meson
meson compile --verbose
mkdir build || (echo "Could not create build dir" && exit 1)

PREFIX=${INST} ./configure.meson
meson compile --verbose -C build
fi
13 changes: 6 additions & 7 deletions configure.meson
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#!/bin/sh
#!/bin/bash

# set -xv

if [ -f meson.build ]; then
if [ ! -d build ] ; then
echo -e "Create a build dir first:"
echo -e "\tmkdir build"
echo -e "\tcd build"
echo -e "\t../$(basename $0)"
echo -e "\t./$(basename $0)"
echo "Bye!"
exit 0
fi
Expand All @@ -21,10 +20,10 @@ meson setup --prefix ${PREFIX} \
--native-file $TOP/fdpp/toolchain.ini \
--cross-file $TOP/fdpp/toolchain.ini \
--cross-file $TOP/fdpp/kernel/toolchain.ini \
--native-file $TOP/fdpp/kernel/toolchain.ini . $TOP
--native-file $TOP/fdpp/kernel/toolchain.ini build $TOP
[ "$?" = "0" ] || exit 1

echo
echo "Done configure"
echo "Now run \"meson compile --verbose\" to build"
echo "After that you can do \"sudo meson install\" to install"
echo "Now run \"meson compile --verbose -C build\" to build"
echo "After that you can do \"sudo meson install -C build\" to install"

0 comments on commit bed46e0

Please sign in to comment.