Skip to content

Commit

Permalink
Use latest version supporting 3.3 (#317)
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
seb4stien and alithethird authored Feb 6, 2025
1 parent f10c722 commit 0a7ac4c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ private-key
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

0 comments on commit 0a7ac4c

Please sign in to comment.