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 62211e3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
6 changes: 2 additions & 4 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ 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
PREFIX=${INST} ./configure.meson build
meson compile --verbose -C build
fi
17 changes: 7 additions & 10 deletions configure.meson
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@

# set -xv

if [ -f meson.build ]; then
echo -e "Create a build dir first:"
echo -e "\tmkdir build"
echo -e "\tcd build"
echo -e "\t../$(basename $0)"
echo "Bye!"
exit 0
if [ -z "$1" ] ; then
echo "Usage: ./$(basename $0) builddir"
exit 1
fi
BLD="$1"

TOP=$(dirname "$0")

Expand All @@ -21,10 +18,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 $BLD $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 $BLD\" to build"
echo "After that you can do \"sudo meson install -C $BLD\" to install"

0 comments on commit 62211e3

Please sign in to comment.