Skip to content

Commit

Permalink
ci: Fix windows-msys build (by fixing libnereon build)
Browse files Browse the repository at this point in the history
This commit re-uses build logic from libnereon's GHA scripts.

Related: #421
  • Loading branch information
ribose-jeffreylau committed Jan 17, 2022
1 parent 8b6d714 commit 8e505d2
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 11 deletions.
15 changes: 10 additions & 5 deletions ci/before_install/msys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@ set -ex

msys_install() {
packages=(
autoconf
automake
mingw-w64-x86_64-cmocka
mingw64/mingw-w64-x86_64-ninja
mingw64/mingw-w64-x86_64-cmake
mingw64/mingw-w64-x86_64-graphviz # for doxygen's dot component
openssl-devel
cmake
cmocka
doxygen
gcc
git
graphviz # for doxygen's dot component
libtool
make
ninja
openssl-devel
)
pacman --noconfirm -S --needed "${packages[@]}"
gem install mustache
Expand Down
19 changes: 13 additions & 6 deletions ci/install_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,17 @@ install_libnereon() {
git clone -b "${LIBNEREON_VERSION}" https://github.com/riboseinc/libnereon
cd libnereon
mkdir build
cd build
cmake ..
ls -la
ls -la ..
make
sudo make install

if [[ "$(get_os)" = msys* ]]
then
cmake -S . -B build -G "Unix Makefiles"
cmake --build build
cmake --build build --target test
cmake --build build --target install
else
cd build
cmake ..
make
sudo make install
fi
}

0 comments on commit 8e505d2

Please sign in to comment.