Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest version supporting 3.3 #317

Merged
merged 5 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .trivyignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# wee_alloc is Unmaintained https://github.com/advisories/GHSA-rc23-xxgq-x27g
GHSA-rc23-xxgq-x27g

Check notice on line 2 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

GHSA-rc23-xxgq-x27g not present anymore, can be safely removed.
# pebble
CVE-2024-34156

Check notice on line 4 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2024-34156 not present anymore, can be safely removed.
CVE-2024-45338

Check notice on line 5 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2024-45338 not present anymore, can be safely removed.
# shlex from ruby test
GHSA-r7qv-8r2h-pg27

Check notice on line 7 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

GHSA-r7qv-8r2h-pg27 not present anymore, can be safely removed.
# squoosh npm package
CVE-2021-32810

Check notice on line 9 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2021-32810 not present anymore, can be safely removed.
CVE-2022-23639

Check notice on line 10 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2022-23639 not present anymore, can be safely removed.
# Ruby Gems
CVE-2024-7254

Check notice on line 12 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2024-7254 not present anymore, can be safely removed.
CVE-2015-9284

Check notice on line 13 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2015-9284 not present anymore, can be safely removed.
CVE-2017-11430

Check notice on line 14 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2017-11430 not present anymore, can be safely removed.
CVE-2024-45409

Check notice on line 15 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-discourse-116828aa9894f3a862b22177c483365d4b39dc38-_1.0_amd64.tar)

CVE-2024-45409 not present anymore, can be safely removed.
GHSA-cvp8-5r8g-fhvq
CVE-2024-49761
CVE-2024-45409
Expand All @@ -34,4 +34,4 @@
CVE-2024-53103
# libc
CVE-2024-56658

CVE-2024-35864
2 changes: 1 addition & 1 deletion discourse_rock/rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ parts:
plugin: dump
after: [discourse, bundler-config]
source: https://github.com/canonical-web-and-design/discourse-markdown-note.git
source-commit: f4426d5929de067f123659dc690e9438a324817a
source-commit: a0d7276360db732c2252507e207ebadd2ffc9fbe
source-depth: 1
organize:
"*": srv/discourse/app/plugins/markdown-note/
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ async def app_fixture(
trust=True,
config={"profile": "testing"},
)
async with ops_test.fast_forward():
await model.wait_for_idle(apps=[postgres_app.name], status="active")
await model.wait_for_idle(apps=[postgres_app.name], status="active")

redis_app = await model.deploy("redis-k8s", series="jammy", channel="latest/edge")
await model.wait_for_idle(apps=[redis_app.name], status="active")
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/test_db_migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ async def test_db_migration(model: Model, ops_test: OpsTest, pytestconfig: Confi
trust=True,
config={"profile": "testing"},
)
async with ops_test.fast_forward():
await model.wait_for_idle(apps=[postgres_app.name], status="active")
await model.wait_for_idle(apps=[postgres_app.name], status="active")
await postgres_app.set_config(
{
"plugin_hstore_enable": "true",
Expand Down
Loading