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

CI: use python-yaml instead of yq if needed (fedora)

Browse Source
This commit is contained in:
Adriaan de Groot 2024-04-06 23:38:20 +02:00
parent 2c52adc8e8
commit 4406a879bc
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ci/build.sh
View File

@ -29,11 +29,16 @@ if test -z "$BUILDDIR" ; then
test -d "/build" && BUILDDIR=/build test -d "/build" && BUILDDIR=/build
fi fi
if test -z "$CMAKE_ARGS" -a -n "$1" ; then if test -z "$CMAKE_ARGS" -a -n "$1" ; then
test -x "$(which yq)" || { echo "! No yq command for finding CMAKE_ARGS for workflow $1" ; exit 1 ; }
_d="$SRCDIR/.github/workflows/$1" _d="$SRCDIR/.github/workflows/$1"
test -f "$_d" || _d="$SRCDIR/.github/workflows/$1.yml" test -f "$_d" || _d="$SRCDIR/.github/workflows/$1.yml"
test -f "$_d" || { echo "! No workflow $1" ; exit 1 ; } test -f "$_d" || { echo "! No workflow $1" ; exit 1 ; }
CMAKE_ARGS=$(yq ".env.CMAKE_ARGS" "$_d")
if test -x "$(which yq)" ; then
CMAKE_ARGS=$(yq ".env.CMAKE_ARGS" "$_d")
else
CMAKE_ARGS=$(python3 -c 'import yaml ; f=open("'$_d'","r"); print(yaml.safe_load(f)["env"]["CMAKE_ARGS"]);')
fi
fi fi
# Sanity check # Sanity check

2
ci/deps-fedora-qt6-boost.sh
View File

@ -4,7 +4,7 @@
# #
yum install -y bison flex git make cmake gcc-c++ ninja-build yum install -y bison flex git make cmake gcc-c++ ninja-build
yum install -y yaml-cpp-devel libpwquality-devel parted-devel python-devel gettext gettext-devel yum install -y yaml-cpp-devel libpwquality-devel parted-devel python-devel gettext gettext-devel python3-pyyaml
yum install -y libicu-devel libatasmart-devel yum install -y libicu-devel libatasmart-devel
yum install -y boost-devel yum install -y boost-devel
# Qt6/KF6 dependencies # Qt6/KF6 dependencies

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

@ -4,7 +4,7 @@
# #
yum install -y bison flex git make cmake gcc-c++ ninja-build yum install -y bison flex git make cmake gcc-c++ ninja-build
yum install -y yaml-cpp-devel libpwquality-devel parted-devel python-devel gettext gettext-devel yum install -y yaml-cpp-devel libpwquality-devel parted-devel python-devel gettext gettext-devel python3-pyyaml
yum install -y libicu-devel libatasmart-devel yum install -y libicu-devel libatasmart-devel
# Qt6/KF6 dependencies # Qt6/KF6 dependencies
yum install -y qt6-qtbase-devel qt6-linguist qt6-qtbase-private-devel qt6-qtdeclarative-devel qt6-qtsvg-devel qt6-qttools-devel yum install -y qt6-qtbase-devel qt6-linguist qt6-qtbase-private-devel qt6-qtdeclarative-devel qt6-qtsvg-devel qt6-qttools-devel