From 5eded289ba0d2baa9d842cace96c2ad413ea65b3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 27 Oct 2024 09:58:59 -0400 Subject: [PATCH] more test things --- .github/workflows/distro_tests.yml | 1 + bbot/modules/wpscan.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/distro_tests.yml b/.github/workflows/distro_tests.yml index 128625654..0d0515ac2 100644 --- a/.github/workflows/distro_tests.yml +++ b/.github/workflows/distro_tests.yml @@ -32,6 +32,7 @@ jobs: elif [ "$ID" = "fedora" ]; then dnf install -y curl git bash gcc make openssl-devel bzip2-devel libffi-devel zlib-devel xz-devel tk-devel gdbm-devel readline-devel sqlite-devel elif [ "$ID" = "gentoo" ]; then + echo "media-libs/libglvnd X" >> /etc/portage/package.use/libglvnd emerge-webrsync emerge --update --newuse dev-vcs/git media-libs/mesa curl bash fi diff --git a/bbot/modules/wpscan.py b/bbot/modules/wpscan.py index 40c1d0181..0dcd69fb3 100644 --- a/bbot/modules/wpscan.py +++ b/bbot/modules/wpscan.py @@ -36,13 +36,13 @@ class wpscan(BaseModule): "name": "Install Ruby Deps (Ubuntu 20.04)", "package": {"name": ["ruby-dev"], "state": "present"}, "become": True, - "when": "ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_version'] == '20.04'", + "when": "ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_major_version'] == '20'", }, { "name": "Install Ruby Deps (Other Debian-based)", "package": {"name": ["ruby-rubygems", "ruby-dev"], "state": "present"}, "become": True, - "when": "ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_version'] != '20.04'", + "when": "ansible_facts['distribution'] == 'Debian' and not (ansible_facts['os_family'] == 'Ubuntu' and ansible_facts['distribution_major_version'] == '20')", }, { "name": "Install Ruby Deps (Arch)",