From 490727ed1961181cd4483d7c960074815e2d79b7 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 7 Nov 2024 16:21:46 +0000 Subject: [PATCH 1/2] Fix incorrect analytics mapping for UTDs. --- .../Sources/FlowCoordinators/UserSessionFlowCoordinator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift index b824715d32..ff62ac4e2b 100644 --- a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift +++ b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift @@ -368,7 +368,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol { switch info.cause { case .unknown: - analytics.trackError(context: nil, domain: .E2EE, name: .UnknownError, timeToDecryptMillis: timeToDecryptMs) + analytics.trackError(context: nil, domain: .E2EE, name: .OlmKeysNotSentError, timeToDecryptMillis: timeToDecryptMs) case .unknownDevice: analytics.trackError(context: nil, domain: .E2EE, name: .ExpectedSentByInsecureDevice, timeToDecryptMillis: timeToDecryptMs) case .unsignedDevice: From fda78a81a899a7b1e373012b550cdba0dd43dbd4 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 7 Nov 2024 16:33:10 +0000 Subject: [PATCH 2/2] Upgrade GitHub workflows to use macOS 15. --- .github/workflows/danger.yml | 2 +- .github/workflows/pr-build.yml | 2 +- .github/workflows/translations-pr.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- .github/workflows/unit_tests_enterprise.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index dabb5e4080..f4e9f148c2 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -7,7 +7,7 @@ on: jobs: build: name: Danger - runs-on: macos-14 + runs-on: macos-15 steps: - name: Checkout diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index b23b449aa6..eecda979ac 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -11,7 +11,7 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build') name: Release - runs-on: macos-14 + runs-on: macos-15 concurrency: # Only allow a single run of this workflow on each branch, automatically cancelling older runs. diff --git a/.github/workflows/translations-pr.yml b/.github/workflows/translations-pr.yml index 2c4ca11abb..5a5003fdf7 100644 --- a/.github/workflows/translations-pr.yml +++ b/.github/workflows/translations-pr.yml @@ -7,7 +7,7 @@ on: jobs: open-translations-pr: - runs-on: macos-14 + runs-on: macos-15 # Skip in forks if: github.repository == 'element-hq/element-x-ios' steps: diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 63fa5e54ed..81be7193e4 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -11,7 +11,7 @@ on: jobs: tests: name: Tests - runs-on: macos-14 + runs-on: macos-15 concurrency: # Only allow a single run of this workflow on each branch, automatically cancelling older runs. diff --git a/.github/workflows/unit_tests_enterprise.yml b/.github/workflows/unit_tests_enterprise.yml index 5bc8baac36..02545643dd 100644 --- a/.github/workflows/unit_tests_enterprise.yml +++ b/.github/workflows/unit_tests_enterprise.yml @@ -11,7 +11,7 @@ on: jobs: tests: name: Tests (Enterprise) - runs-on: macos-14 + runs-on: macos-15 # Skip in forks if: github.repository == 'element-hq/element-x-ios'