Skip to content

Automatic merge back to main #4441

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Apr 23, 2025
Merged

Automatic merge back to main #4441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10afe9b
Fix starting up when no telemetry config is set
sandhose Apr 23, 2025
090bd14
Translations updates
github-actions[bot] Apr 23, 2025
7d83cab
Translations updates for v0.15 (#4438)
matrixbot Apr 23, 2025
ae58db7
Fix starting up when no telemetry config is set (#4437)
sandhose Apr 23, 2025
2daa9bf
0.15.0
github-actions[bot] Apr 23, 2025
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
54 changes: 27 additions & 27 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 29 additions & 29 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ members = ["crates/*"]
resolver = "2"

# Updated in the CI with a `sed` command
package.version = "0.15.0-rc.0"
package.version = "0.15.0"
package.license = "AGPL-3.0-only"
package.authors = ["Element Backend Team"]
package.edition = "2024"
Expand All @@ -27,34 +27,34 @@ broken_intra_doc_links = "deny"
[workspace.dependencies]

# Workspace crates
mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.15.0-rc.0" }
mas-cli = { path = "./crates/cli/", version = "=0.15.0-rc.0" }
mas-config = { path = "./crates/config/", version = "=0.15.0-rc.0" }
mas-data-model = { path = "./crates/data-model/", version = "=0.15.0-rc.0" }
mas-email = { path = "./crates/email/", version = "=0.15.0-rc.0" }
mas-graphql = { path = "./crates/graphql/", version = "=0.15.0-rc.0" }
mas-handlers = { path = "./crates/handlers/", version = "=0.15.0-rc.0" }
mas-http = { path = "./crates/http/", version = "=0.15.0-rc.0" }
mas-i18n = { path = "./crates/i18n/", version = "=0.15.0-rc.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.15.0-rc.0" }
mas-iana = { path = "./crates/iana/", version = "=0.15.0-rc.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.15.0-rc.0" }
mas-jose = { path = "./crates/jose/", version = "=0.15.0-rc.0" }
mas-keystore = { path = "./crates/keystore/", version = "=0.15.0-rc.0" }
mas-listener = { path = "./crates/listener/", version = "=0.15.0-rc.0" }
mas-matrix = { path = "./crates/matrix/", version = "=0.15.0-rc.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.15.0-rc.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.15.0-rc.0" }
mas-policy = { path = "./crates/policy/", version = "=0.15.0-rc.0" }
mas-router = { path = "./crates/router/", version = "=0.15.0-rc.0" }
mas-spa = { path = "./crates/spa/", version = "=0.15.0-rc.0" }
mas-storage = { path = "./crates/storage/", version = "=0.15.0-rc.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.15.0-rc.0" }
mas-tasks = { path = "./crates/tasks/", version = "=0.15.0-rc.0" }
mas-templates = { path = "./crates/templates/", version = "=0.15.0-rc.0" }
mas-tower = { path = "./crates/tower/", version = "=0.15.0-rc.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=0.15.0-rc.0" }
syn2mas = { path = "./crates/syn2mas", version = "=0.15.0-rc.0" }
mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.15.0" }
mas-cli = { path = "./crates/cli/", version = "=0.15.0" }
mas-config = { path = "./crates/config/", version = "=0.15.0" }
mas-data-model = { path = "./crates/data-model/", version = "=0.15.0" }
mas-email = { path = "./crates/email/", version = "=0.15.0" }
mas-graphql = { path = "./crates/graphql/", version = "=0.15.0" }
mas-handlers = { path = "./crates/handlers/", version = "=0.15.0" }
mas-http = { path = "./crates/http/", version = "=0.15.0" }
mas-i18n = { path = "./crates/i18n/", version = "=0.15.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.15.0" }
mas-iana = { path = "./crates/iana/", version = "=0.15.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.15.0" }
mas-jose = { path = "./crates/jose/", version = "=0.15.0" }
mas-keystore = { path = "./crates/keystore/", version = "=0.15.0" }
mas-listener = { path = "./crates/listener/", version = "=0.15.0" }
mas-matrix = { path = "./crates/matrix/", version = "=0.15.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.15.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.15.0" }
mas-policy = { path = "./crates/policy/", version = "=0.15.0" }
mas-router = { path = "./crates/router/", version = "=0.15.0" }
mas-spa = { path = "./crates/spa/", version = "=0.15.0" }
mas-storage = { path = "./crates/storage/", version = "=0.15.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.15.0" }
mas-tasks = { path = "./crates/tasks/", version = "=0.15.0" }
mas-templates = { path = "./crates/templates/", version = "=0.15.0" }
mas-tower = { path = "./crates/tower/", version = "=0.15.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=0.15.0" }
syn2mas = { path = "./crates/syn2mas", version = "=0.15.0" }

# OpenAPI schema generation and validation
[workspace.dependencies.aide]
Expand Down
4 changes: 2 additions & 2 deletions crates/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{io::IsTerminal, process::ExitCode, sync::Arc};

use anyhow::Context;
use clap::Parser;
use mas_config::{ConfigurationSection, TelemetryConfig};
use mas_config::{ConfigurationSectionExt, TelemetryConfig};
use sentry_tracing::EventFilter;
use tracing_subscriber::{
EnvFilter, Layer, Registry, filter::LevelFilter, layer::SubscriberExt, util::SubscriberInitExt,
Expand Down Expand Up @@ -110,7 +110,7 @@ async fn try_main() -> anyhow::Result<ExitCode> {
let figment = opts.figment();

let telemetry_config =
TelemetryConfig::extract(&figment).context("Failed to load telemetry config")?;
TelemetryConfig::extract_or_default(&figment).context("Failed to load telemetry config")?;

// Setup Sentry
let sentry = sentry::init((
Expand Down
Loading
Loading