From 9c512ad1ec6e67cfe1b91e8d3a1bf4c83ba66c92 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 9 Nov 2024 05:14:14 -0500 Subject: [PATCH 1/5] fix ubuntu chrome --- bbot/core/shared_deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbot/core/shared_deps.py b/bbot/core/shared_deps.py index fa0be8b101..7e81f69159 100644 --- a/bbot/core/shared_deps.py +++ b/bbot/core/shared_deps.py @@ -81,7 +81,7 @@ { "name": "Install Chromium dependencies (Debian)", "package": { - "name": "libasound2,libatk-bridge2.0-0,libatk1.0-0,libcairo2,libcups2,libdrm2,libgbm1,libnss3,libpango-1.0-0,libglib2.0-0,libxcomposite1,libxdamage1,libxfixes3,libxkbcommon0,libxrandr2", + "name": "libatk-bridge2.0-0,libatk1.0-0,libcairo2,libcups2,libdrm2,libgbm1,libnss3,libpango-1.0-0,libglib2.0-0,libxcomposite1,libxdamage1,libxfixes3,libxkbcommon0,libxrandr2", "state": "present", }, "become": True, From 328de600955fa7ae321068b725f9eb98ebd9bb1f Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 11 Nov 2024 16:00:02 -0500 Subject: [PATCH 2/5] fix ubuntu again? --- bbot/core/shared_deps.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bbot/core/shared_deps.py b/bbot/core/shared_deps.py index 7e81f69159..f1d10f26b3 100644 --- a/bbot/core/shared_deps.py +++ b/bbot/core/shared_deps.py @@ -79,13 +79,23 @@ "ignore_errors": True, }, { - "name": "Install Chromium dependencies (Debian)", + "name": "Install Chromium dependencies (Ubuntu 24.04)", + "package": { + "name": "libasound2t64,libatk-bridge2.0-0,libatk1.0-0,libcairo2,libcups2,libdrm2,libgbm1,libnss3,libpango-1.0-0,libglib2.0-0,libxcomposite1,libxdamage1,libxfixes3,libxkbcommon0,libxrandr2", + "state": "present", + }, + "become": True, + "when": "ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_version'] == '24.04'", + "ignore_errors": True, + }, + { + "name": "Install Chromium dependencies (Other Debian-based)", "package": { "name": "libatk-bridge2.0-0,libatk1.0-0,libcairo2,libcups2,libdrm2,libgbm1,libnss3,libpango-1.0-0,libglib2.0-0,libxcomposite1,libxdamage1,libxfixes3,libxkbcommon0,libxrandr2", "state": "present", }, "become": True, - "when": "ansible_facts['os_family'] == 'Debian'", + "when": "ansible_facts['os_family'] == 'Debian' and not (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_version'] == '24.04')", "ignore_errors": True, }, { From cf7686b3e9342237a7372291af8f8cf815ad045d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 11 Nov 2024 16:00:41 -0500 Subject: [PATCH 3/5] test gowitness only --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 507b7ac547..99c6574dd0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: poetry install - name: Run tests run: | - poetry run pytest --exitfirst --reruns 2 -o timeout_func_only=true --timeout 1200 --disable-warnings --log-cli-level=INFO --cov-config=bbot/test/coverage.cfg --cov-report xml:cov.xml --cov=bbot . + poetry run pytest --exitfirst --reruns 2 -o timeout_func_only=true --timeout 1200 --disable-warnings --log-cli-level=INFO --cov-config=bbot/test/coverage.cfg --cov-report xml:cov.xml --cov=bbot -k gowitness . - name: Upload Debug Logs uses: actions/upload-artifact@v3 with: From 836d11536f903d72042fb124bb1af684a26c0389 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 11 Nov 2024 16:05:40 -0500 Subject: [PATCH 4/5] only gowitness --- .github/workflows/distro_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/distro_tests.yml b/.github/workflows/distro_tests.yml index 95f9d7b5f0..d54b7a667c 100644 --- a/.github/workflows/distro_tests.yml +++ b/.github/workflows/distro_tests.yml @@ -61,4 +61,4 @@ jobs: export BBOT_DISTRO_TESTS=true poetry env use python3.11 poetry install - poetry run pytest --reruns 2 -o timeout_func_only=true --timeout 1200 --disable-warnings --log-cli-level=INFO . + poetry run pytest --reruns 2 -o timeout_func_only=true --timeout 1200 --disable-warnings --log-cli-level=INFO -k gowitness . From 437ac861043c4a1bc8c6bb45a29160bafcca52d9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 11 Nov 2024 16:13:19 -0500 Subject: [PATCH 5/5] wat --- bbot/core/shared_deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbot/core/shared_deps.py b/bbot/core/shared_deps.py index f1d10f26b3..bac3ded7b6 100644 --- a/bbot/core/shared_deps.py +++ b/bbot/core/shared_deps.py @@ -91,7 +91,7 @@ { "name": "Install Chromium dependencies (Other Debian-based)", "package": { - "name": "libatk-bridge2.0-0,libatk1.0-0,libcairo2,libcups2,libdrm2,libgbm1,libnss3,libpango-1.0-0,libglib2.0-0,libxcomposite1,libxdamage1,libxfixes3,libxkbcommon0,libxrandr2", + "name": "libasound2,libatk-bridge2.0-0,libatk1.0-0,libcairo2,libcups2,libdrm2,libgbm1,libnss3,libpango-1.0-0,libglib2.0-0,libxcomposite1,libxdamage1,libxfixes3,libxkbcommon0,libxrandr2", "state": "present", }, "become": True,