diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a5e9bfc..ec20fd7 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -6,7 +6,7 @@ on: - main env: - VERSION: 2.3.0 + VERSION: 2.4.0 jobs: # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами) diff --git a/Directory.Build.props b/Directory.Build.props index a6bc8ab..e36cb8b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 2.3.0 + 2.4.0 net10.0 preview enable diff --git a/compose.yaml b/compose.yaml index 6044e1f..9b27593 100644 --- a/compose.yaml +++ b/compose.yaml @@ -49,7 +49,7 @@ services: crond -f bot: - image: git.codeanddice.ru/toutsu/gmrelay-bot:2.3.0 + image: git.codeanddice.ru/toutsu/gmrelay-bot:2.4.0 restart: always depends_on: db: @@ -67,7 +67,7 @@ services: retries: 3 discord: - image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:2.3.0 + image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:2.4.0 restart: always depends_on: db: @@ -79,7 +79,7 @@ services: - gmrelay web: - image: git.codeanddice.ru/toutsu/gmrelay-web:2.3.0 + image: git.codeanddice.ru/toutsu/gmrelay-web:2.4.0 restart: always depends_on: db: diff --git a/src/GmRelay.DiscordBot/packages.lock.json b/src/GmRelay.DiscordBot/packages.lock.json index bb4d655..b96db0c 100644 --- a/src/GmRelay.DiscordBot/packages.lock.json +++ b/src/GmRelay.DiscordBot/packages.lock.json @@ -22,6 +22,12 @@ "OpenTelemetry.Extensions.Hosting": "1.15.0" } }, + "Dapper": { + "type": "Direct", + "requested": "[2.1.72, )", + "resolved": "2.1.72", + "contentHash": "ns4mGqQd9a/MhP8m6w556vVlZIa0/MfUu03zrxjZC/jlr1uVCsUac8bkdB+Fs98Llbd56rRSo1eZH5VVmeGZyw==" + }, "Microsoft.Extensions.Hosting": { "type": "Direct", "requested": "[10.0.5, )", @@ -79,6 +85,15 @@ "NetCord.Services": "1.0.0-alpha.489" } }, + "NetCord.Services": { + "type": "Direct", + "requested": "[1.0.0-alpha.489, )", + "resolved": "1.0.0-alpha.489", + "contentHash": "SwG/7Khba1uRENDvG22RV/POByIwh/ZrenMrSzwoEcEYPMI5TabmEEB3ySH15XGdLcFZJEj106AlriN0kZhfFg==", + "dependencies": { + "NetCord": "1.0.0-alpha.489" + } + }, "Npgsql": { "type": "Direct", "requested": "[10.0.2, )", @@ -519,14 +534,6 @@ "resolved": "1.0.0-alpha.489", "contentHash": "/rM73l1pwwJCWHi7YrIiSVc+GVL0lV+k+amqNJUMINjLO+c5bKWj9PoNNoMhiPZoaORO4k6Uxp8EQfoQj3AYtA==" }, - "NetCord.Services": { - "type": "Transitive", - "resolved": "1.0.0-alpha.489", - "contentHash": "SwG/7Khba1uRENDvG22RV/POByIwh/ZrenMrSzwoEcEYPMI5TabmEEB3ySH15XGdLcFZJEj106AlriN0kZhfFg==", - "dependencies": { - "NetCord": "1.0.0-alpha.489" - } - }, "Npgsql.DependencyInjection": { "type": "Transitive", "resolved": "10.0.1", diff --git a/src/GmRelay.Web/Components/Layout/NavMenu.razor b/src/GmRelay.Web/Components/Layout/NavMenu.razor index 5306eb6..11a6f1b 100644 --- a/src/GmRelay.Web/Components/Layout/NavMenu.razor +++ b/src/GmRelay.Web/Components/Layout/NavMenu.razor @@ -56,7 +56,7 @@ - + diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs index 03da6c9..2bc0f84 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs @@ -61,7 +61,7 @@ public sealed class DiscordProjectStructureTests var prChecks = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "pr-checks.yml")); var deploy = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")); - Assert.Contains("gmrelay-discord-bot:2.3.0", compose); + Assert.Contains("gmrelay-discord-bot:2.4.0", compose); Assert.Contains("Discord__Token=${DISCORD_BOT_TOKEN:?Set DISCORD_BOT_TOKEN in .env}", compose); Assert.Contains("src/GmRelay.DiscordBot/Dockerfile", deploy); Assert.Contains("DISCORD_BOT_TOKEN", deploy); @@ -75,13 +75,13 @@ public sealed class DiscordProjectStructureTests { var repoRoot = GetRepoRoot(); - Assert.Contains("2.3.0", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); - Assert.Contains("VERSION: 2.3.0", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); - Assert.Contains("gmrelay-bot:2.3.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-web:2.3.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-discord-bot:2.3.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("2.4.0", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); + Assert.Contains("VERSION: 2.4.0", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); + Assert.Contains("gmrelay-bot:2.4.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-web:2.4.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-discord-bot:2.4.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); Assert.Contains( - "v2.3.0", + "v2.4.0", File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor"))); } } diff --git a/tests/GmRelay.Bot.Tests/packages.lock.json b/tests/GmRelay.Bot.Tests/packages.lock.json index 069ccdc..c9554c1 100644 --- a/tests/GmRelay.Bot.Tests/packages.lock.json +++ b/tests/GmRelay.Bot.Tests/packages.lock.json @@ -392,8 +392,8 @@ "Aspire.Npgsql": "[13.2.2, )", "Dapper": "[2.1.72, )", "Dapper.AOT": "[1.0.48, )", - "GmRelay.ServiceDefaults": "[2.1.1, )", - "GmRelay.Shared": "[2.1.1, )", + "GmRelay.ServiceDefaults": "[2.3.0, )", + "GmRelay.Shared": "[2.3.0, )", "Npgsql": "[10.0.2, )", "Telegram.Bot": "[22.9.5.3, )", "dbup-postgresql": "[7.0.1, )" @@ -403,10 +403,12 @@ "type": "Project", "dependencies": { "Aspire.Npgsql": "[13.2.2, )", - "GmRelay.ServiceDefaults": "[2.1.1, )", - "GmRelay.Shared": "[2.1.1, )", + "Dapper": "[2.1.72, )", + "GmRelay.ServiceDefaults": "[2.3.0, )", + "GmRelay.Shared": "[2.3.0, )", "NetCord.Hosting": "[1.0.0-alpha.489, )", "NetCord.Hosting.Services": "[1.0.0-alpha.489, )", + "NetCord.Services": "[1.0.0-alpha.489, )", "Npgsql": "[10.0.2, )" } }, @@ -430,8 +432,8 @@ "dependencies": { "Aspire.Npgsql": "[13.2.2, )", "Dapper": "[2.1.72, )", - "GmRelay.ServiceDefaults": "[2.1.1, )", - "GmRelay.Shared": "[2.1.1, )", + "GmRelay.ServiceDefaults": "[2.3.0, )", + "GmRelay.Shared": "[2.3.0, )", "Npgsql": "[10.0.2, )", "Telegram.Bot": "[22.9.6.1, )" }