Skip to content

chore: back-merge main into develop after v2.3(Verawood.1) - #668

Open
IvanStepanok wants to merge 17 commits into
developfrom
main
Open

IvanStepanok wants to merge 17 commits into
developfrom
main

Conversation

@IvanStepanok

Copy link
Copy Markdown
Contributor

Brings develop back in line with main after the Verawood release.

develop is strictly behind — 9 commits, nothing ahead — so this is a clean catch-up with no conflicts.

What it carries over

  • chore: pin GitHub Actions workflows to full commit SHAs #660, which pinned the third-party actions in swiftlint.yml, unit_tests.yml and validate-translations.yml to full commit SHAs. It landed on main only, so develop still refers to those actions by tag.
  • The v2.3(Verawood.1) release merge commit itself.

Why it matters now

main and develop had been drifting since 2026-05-28. #660 touched the same two workflow files that #666 rewrote during the release, and that was resolved once, in the release merge — cleanly, because the two changed different lines. Leaving develop behind means the next release merge would have to resolve the same overlap again, against a develop that has moved on further.

Verified on main after the release merge: both changes survived — the actions are SHA-pinned and ruby/setup-ruby with ruby-version: 3.3 and xcodes select 26.2 are present.

@openedx-webhooks openedx-webhooks added open-source-contribution PR author is not from Axim or 2U core contributor PR author is a Core Contributor (who may or may not have write access to this repo). labels Aug 13, 2026
@openedx-webhooks

Copy link
Copy Markdown

Thanks for the pull request, @IvanStepanok!

This repository is currently maintained by @openedx/openedx-mobile-maintainers.

Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review.

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.
🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads
🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

Details
Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

@codecov

codecov Bot commented Aug 13, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 0.00%. Comparing base (0c72bd4) to head (4cbcb46).

Additional details and impacted files
@@      Coverage Diff       @@
##   develop   #668   +/-   ##
==============================
==============================

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mphilbrick211 mphilbrick211 moved this from Needs Triage to Ready for Review in Contributions Aug 19, 2026
@mphilbrick211
mphilbrick211 requested a review from a team August 19, 2026 19:56
Adds the Sendable Tenant value type and TenantsConfig container that
later multi-tenant layers build on: per-tenant API/SSO/OAuth config,
UI feature flags (UIComponentsConfig, now @unchecked Sendable), and
raw branding fields for a later theming layer to render.

Tenant(dictionary:) parses config.yaml's new TENANTS block.

Not included here: remote catalog fetching, tenant selection/session
state, and anything reading TenantProvider — those land as separate
PRs. TENANTS data in config.yaml is illustrative, not real tenants.
Renames the Tenant domain model and its wire schema to Instance, per
community naming feedback. Tenant -> Instance, TenantsConfig ->
InstancesConfig, TenantProvider -> InstanceProvider,
TenantThemeColors -> InstanceThemeColors; config.yaml's TENANTS block
-> INSTANCES, TENANT_NAME -> INSTANCE_NAME,
IS_SWITCH_TENANT_LOGIN_ENABLED -> IS_SWITCH_INSTANCE_LOGIN_ENABLED.

Pure rename, no behavior change. KEY is left as-is (already generic).
SSO_URL_SUCCESSFUL_LOGIN/successfulSSOLoginURL is untouched here too --
its rename to SSO_FINISHED_URL is separate, upcoming work.
Adds ThemeColorSet/ThemeDefinition/ThemeFontSet and ThemeManager:
derives a tenant's palette from its accent hex plus any per-field
THEME overrides, and resolves its logo/header banner from a remote
URL (cached in-memory, falling back to the bundled default) or a
bundled asset name.

Looked up by the tenant's stable key, not a localized display-name
string. Takes primitives, not Core's Tenant struct -- Theme has no
build dependency on Core.

Not called from anywhere yet -- RouteController wires up
applyTheme(...) in a later PR. With one generic placeholder asset for customer logo,
matching config.yaml's example-tenant entry.
Renames the theme engine's tenant-facing surface to instance
(ThemeColorSet/ThemeDefinition/ThemeManager doc comments and params,
TenantLogoImage/TenantHeaderBackgroundImage -> InstanceLogoImage/
InstanceHeaderBackgroundImage, exampleTenantAppLogo asset ->
exampleInstanceAppLogo), per the community's naming feedback.
feat: add per-instance theme engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core contributor PR author is a Core Contributor (who may or may not have write access to this repo). open-source-contribution PR author is not from Axim or 2U

Projects

Status: Ready for Review

Development

Successfully merging this pull request may close these issues.

7 participants