From 9472d897bdcbab27c32f8d6acd37fc39f861ed2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 15 May 2024 13:31:57 +0200 Subject: [PATCH] CI: Adapt for dnf5 DNF5 is stricter in distinguishing between global and subcommand options. --skip-broken belongs to install subcommand. --- .ci/fedora/get_fedora_deps.sh | 2 +- fedora/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/fedora/get_fedora_deps.sh b/.ci/fedora/get_fedora_deps.sh index 46c7ac2c3..47febb8cc 100755 --- a/.ci/fedora/get_fedora_deps.sh +++ b/.ci/fedora/get_fedora_deps.sh @@ -7,7 +7,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" pushd $SCRIPT_DIR dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' \ - --nogpgcheck --skip-broken --quiet install \ + --nogpgcheck --quiet install --skip-broken \ python3-black \ clang \ clang-analyzer \ diff --git a/fedora/tests.yml b/fedora/tests.yml index f736549da..7a4f044fe 100644 --- a/fedora/tests.yml +++ b/fedora/tests.yml @@ -10,7 +10,7 @@ - classic tasks: - name: Make sure fedpkg and selinux bindings are installed - shell: dnf -y install fedpkg python{2,3}-libselinux libmodulemd-devel --skip-broken + shell: dnf -y install --skip-broken fedpkg python{2,3}-libselinux libmodulemd-devel - name: Copy spec file to remote machine copy: src: "{{ playbook_dir }}/../libmodulemd.spec"