napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: switch example & CI builds to ninja

Browse Source
This commit is contained in:
Adriaan de Groot 2023-10-03 14:08:30 +02:00
parent 6b61197402
commit ed1f4876aa
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/build.sh
View File

@ -13,8 +13,8 @@ test -n "$GIT_HASH" && BUILD_MESSAGE=$( git log -1 --abbrev-commit --pretty=onel
echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::" echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::"
cmake -S "$SRCDIR" -B "$BUILDDIR" $CMAKE_ARGS || exit 1 cmake -S "$SRCDIR" -B "$BUILDDIR" -G Ninja $CMAKE_ARGS || exit 1
make -C "$BUILDDIR" -j2 VERBOSE=1 || exit 1 ninja -C "$BUILDDIR" || exit 1
make -C "$BUILDDIR" install VERBOSE=1 || exit 1 ninja -C "$BUILDDIR" install || exit 1
echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::" echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::"

2
ci/deps-debian11.sh
View File

@ -3,7 +3,7 @@
# Install dependencies for the nightly-debian (11) build # Install dependencies for the nightly-debian (11) build
# #
apt-get update apt-get update
apt-get -y install git-core jq curl apt-get -y install git-core jq curl ninja
apt-get -y install \ apt-get -y install \
build-essential \ build-essential \
cmake \ cmake \

2
ci/deps-neon.sh
View File

@ -3,7 +3,7 @@
# Install dependencies for the nightly-neon build # Install dependencies for the nightly-neon build
# #
apt-get update apt-get update
apt-get -y install git-core jq apt-get -y install git-core jq ninja
apt-get -y install \ apt-get -y install \
build-essential \ build-essential \
cmake \ cmake \

2
ci/deps-opensuse-qt6.sh
View File

@ -8,7 +8,7 @@ zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/h
zypper --non-interactive refresh zypper --non-interactive refresh
zypper --non-interactive up zypper --non-interactive up
zypper --non-interactive in git-core jq curl zypper --non-interactive in git-core jq curl ninja
# From deploycala.py # From deploycala.py
zypper --non-interactive in bison flex git make cmake gcc-c++ zypper --non-interactive in bison flex git make cmake gcc-c++
zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python-devel libboost_headers-devel libboost_python3-devel zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python-devel libboost_headers-devel libboost_python3-devel

2
ci/deps-opensuse.sh
View File

@ -3,7 +3,7 @@
# Install dependencies for the nightly-opensuse build # Install dependencies for the nightly-opensuse build
# #
zypper --non-interactive up zypper --non-interactive up
zypper --non-interactive in git-core jq curl zypper --non-interactive in git-core jq curl ninja
# From deploycala.py # From deploycala.py
zypper --non-interactive in \ zypper --non-interactive in \
"bison" \ "bison" \