fix: resolve merge conflicts with main branch

Merge origin/main into feature branch, resolving 3 conflicts:
- app/api/__init__.py: add classification_rules_router alongside new
  routers from main (audit_logs, i18n, mobile, compliance, translation)
- app/models.py: keep ClassificationRuleModel alongside new models from
  main (MobileDevice, ComplianceTemplate, PipelineRoutingRule)
- tests/conftest.py: import both ClassificationRuleModel and new models
  from main (AuditLog, ComplianceTemplate)

Also renumber migration from 027 to 037 to chain from the latest
migration on main (036_add_document_translation_fields).

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-16 22:33:59 +00:00
parent 23498e0a98
commit 651b48658c
318 changed files with 317516 additions and 2858 deletions
+38
View File
@@ -0,0 +1,38 @@
name: Build and submit
on:
push:
branches:
- main
paths:
- mobile/**
jobs:
build_android:
name: Build Android app
type: build
env:
# Suppress Node.js url.parse() deprecation warnings ([DEP0169]) emitted by
# EAS CLI when running on the build image's system Node 22+.
NODE_NO_WARNINGS: "1"
params:
platform: android
profile: production
build_ios:
name: Build iOS app
type: build
env:
# Suppress Node.js url.parse() deprecation warnings ([DEP0169]) emitted by
# EAS CLI when running on the build image's system Node 22+.
NODE_NO_WARNINGS: "1"
params:
platform: ios
profile: production
submit_ios:
name: Submit iOS to App Store Connect
needs: [build_ios]
type: submit
params:
build_id: ${{ needs.build_ios.outputs.build_id }}