From 0a7ac4c5d061eaf117a3fb0d1808b5098dbdd5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Georget?= Date: Thu, 6 Feb 2025 13:54:27 +0100 Subject: [PATCH] Use latest version supporting 3.3 (#317) Upgrading to discourse 3.3 breaks the compatibility with the pinned discourse-markdown-note module. A new version of the module has been released, and we're updating the dependency accordingly. --------- Co-authored-by: Ali Ugur --- .trivyignore | 2 +- discourse_rock/rockcraft.yaml | 2 +- tests/integration/conftest.py | 3 +-- tests/integration/test_db_migration.py | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.trivyignore b/.trivyignore index 6390bb9d..3ac1c46e 100644 --- a/.trivyignore +++ b/.trivyignore @@ -34,4 +34,4 @@ private-key CVE-2024-53103 # libc CVE-2024-56658 - +CVE-2024-35864 diff --git a/discourse_rock/rockcraft.yaml b/discourse_rock/rockcraft.yaml index 57b32a38..8e13c285 100644 --- a/discourse_rock/rockcraft.yaml +++ b/discourse_rock/rockcraft.yaml @@ -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/ diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index e2803821..1aaa0862 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -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") diff --git a/tests/integration/test_db_migration.py b/tests/integration/test_db_migration.py index be4cbce0..12be77e3 100644 --- a/tests/integration/test_db_migration.py +++ b/tests/integration/test_db_migration.py @@ -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",