From 4406a879bcb192e544ef5b7a8465aa6e560c4b65 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 6 Apr 2024 23:38:20 +0200 Subject: [PATCH] CI: use python-yaml instead of yq if needed (fedora) --- ci/build.sh | 9 +++++++-- ci/deps-fedora-qt6-boost.sh | 2 +- ci/deps-fedora-qt6.sh | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 7108f9d1d..56ca770f1 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -29,11 +29,16 @@ if test -z "$BUILDDIR" ; then test -d "/build" && BUILDDIR=/build fi 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" test -f "$_d" || _d="$SRCDIR/.github/workflows/$1.yml" 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 # Sanity check diff --git a/ci/deps-fedora-qt6-boost.sh b/ci/deps-fedora-qt6-boost.sh index 01e3e3449..7026927a7 100755 --- a/ci/deps-fedora-qt6-boost.sh +++ b/ci/deps-fedora-qt6-boost.sh @@ -4,7 +4,7 @@ # 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 boost-devel # Qt6/KF6 dependencies diff --git a/ci/deps-fedora-qt6.sh b/ci/deps-fedora-qt6.sh index 2d2e83ce5..9f91ada18 100755 --- a/ci/deps-fedora-qt6.sh +++ b/ci/deps-fedora-qt6.sh @@ -4,7 +4,7 @@ # 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 # Qt6/KF6 dependencies yum install -y qt6-qtbase-devel qt6-linguist qt6-qtbase-private-devel qt6-qtdeclarative-devel qt6-qtsvg-devel qt6-qttools-devel