Skip to content

Commit 700e164

Browse files
authored
Merge branch 'mozilla:main' into master
2 parents a052e86 + b92b535 commit 700e164

2,674 files changed

Lines changed: 72415 additions & 46331 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.adr-dir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docs/architecture/decisions
1+
docs/docs/architecture/decisions

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
.env
33
**/__pycache__
44
**/*.pyc
5+
6+
# Ignore generated credentials from google-github-actions/auth
7+
gha-creds-*.json

.github/CODEOWNERS

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# See the code-owners Github docs:
2+
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
3+
4+
# Mostly backend-y directories
5+
/bedrock @mozilla/bedrock-codeowners-backend
6+
/docker @mozilla/bedrock-codeowners-backend
7+
/lib @mozilla/bedrock-codeowners-backend
8+
/requirements @mozilla/bedrock-codeowners-backend
9+
/wsgi @mozilla/bedrock-codeowners-backend
10+
*.py @mozilla/bedrock-codeowners-backend
11+
12+
# Mostly frontend-y directories
13+
/media @mozilla/bedrock-codeowners-frontend
14+
/package.json @mozilla/bedrock-codeowners-frontend
15+
*.html @mozilla/bedrock-codeowners-frontend
16+
*.js @mozilla/bedrock-codeowners-frontend
17+
*.scss @mozilla/bedrock-codeowners-frontend
18+
19+
# Top-level /tests are mostly frontend-y
20+
/tests @mozilla/bedrock-codeowners-frontend

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ for development, as well as how to format your code and commit messages.
77
Following these guidelines will very much increase the chances of a pleasant
88
code-review experience.
99

10-
[bedrock docs]: http://bedrock.readthedocs.org/en/latest/contribute.html
10+
[bedrock docs]: https://mozmeao.github.io/platform-docs/contribute/
1111

1212
## How to Get Started
1313

@@ -16,7 +16,7 @@ If this is your first time contributing then we suggest you first
1616
a little. This will help you familiarize yourself with the layout of files and
1717
how they relate to different pages of the website.
1818

19-
[install bedrock]: https://bedrock.readthedocs.io/en/latest/install.html#installing-bedrock
19+
[install bedrock]: https://mozmeao.github.io/platform-docs/install/
2020

2121
## Finding an Issue to Work On
2222

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "Bug Report \U0001F41B"
33
about: Something isn't working as expected? Here is the right place to report.
44
title: ''
5-
labels: 'Bug :bug:'
5+
labels: 'Bug'
66
assignees: ''
77

88
---

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
## One-line summary
1+
_If this changeset needs to go into the FXC codebase, please add the `WMO and FXC` label._
22

33

4+
## One-line summary
45

5-
- [ ] I used an AI to write some of this code.
66

77
## Significant changes and points to review
88

.github/actions/slack/action.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,23 @@ inputs:
99
env_name:
1010
description: Name of env involved - one of dev, test, stage or prod
1111
required: true
12+
type: choice
13+
options:
14+
- dev
15+
- test
16+
- stage
17+
- prod
1218
label:
1319
description: Very brief summary of what this notification is for - e.g. 'Integration tests'
1420
required: true
1521
status:
1622
description: Status of message type to be sent, supported values 'info', 'success', 'failure'
1723
required: true
24+
type: choice
25+
options:
26+
- info
27+
- success
28+
- failure
1829
channel_id:
1930
description: Slack channel id to send messages
2031
required: true
@@ -39,8 +50,10 @@ runs:
3950
steps:
4051
- id: set-build-status-color
4152
shell: bash
53+
env:
54+
STATUS: ${{ inputs.status }}
4255
run: >-
43-
eval "case ${{ inputs.status }} in
56+
eval "case $STATUS in
4457
info)
4558
echo 'STATUS_COLOR=#00FFFF';;
4659
success)

.github/copilot-instructions.md

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# Review guidelines for Github Copilot
2+
3+
When reviewing code:
4+
5+
Fetch the latest version of all the checklists mentioned on https://mozmeao.github.io/platform-docs/code-review/checklists/ - use these as a guide to our project best practices. You may cache these for up to three days at a time.
6+
7+
Try to use Conventional Comments to indicate the kind of feedback you are providing, and whether it's blocking or non-blocking.
8+
9+
Areas to consider when reviewing:
10+
11+
## 1. Correctness & Safety
12+
13+
* Potential bugs, edge cases, or incorrect assumptions
14+
15+
* Error handling (especially around I/O, network calls, and external services)
16+
17+
* Race conditions, concurrency issues, or state inconsistencies
18+
19+
* Security concerns (e.g., injection risks, unsafe deserialization, secrets handling)
20+
21+
Heavily flag changes that add risks to uptime or functionality that do not appear to have been considered in the changeset.
22+
Be particularly aware of CMS-backed content that is not richtext. Ensure it's escaped properly when used in templates.
23+
24+
25+
## 2. Design & Architecture
26+
27+
* Is the code structured in a way that will scale and be maintainable?
28+
29+
* Are responsibilities clearly separated?
30+
31+
* Are abstractions appropriate, or is the code over/under-engineered?
32+
33+
* Does this change align with existing patterns in the codebase?
34+
35+
36+
## 3. Readability & Intent
37+
38+
* Is the intent of the code obvious to a future reader?
39+
40+
* Are names (variables, functions, classes) clear and meaningful?
41+
42+
* Would a short comment help explain _why_ something is done (not _what_)?
43+
44+
45+
## 4. Tests
46+
47+
* Are new behaviors adequately covered by tests?
48+
49+
* Do tests clearly express intent?
50+
51+
* Are edge cases tested where appropriate?
52+
53+
* Flag missing tests, but don’t require tests for trivial changes
54+
55+
56+
## 5. Performance (When Relevant)
57+
58+
* Call out obvious inefficiencies or unnecessary work
59+
60+
* Avoid premature optimization
61+
62+
* Note performance implications only if they are meaningful in context
63+
64+
## 6. Localization (L10N)
65+
66+
* If new strings are added to the codebase that are not marked up as Fluent strings, add a non-blocking comment questioning whether they need to be translated or are OK in just one language.
67+
68+
69+
# What Not to Do
70+
71+
* Do not restate what the code already clearly shows
72+
73+
* Do not suggest large refactors unless there is a clear payoff
74+
75+
* Do not enforce personal style preferences
76+
77+
* Do not block on formatting issues that can be handled by linters or formatters
78+
79+
# How to Write Comments
80+
81+
* Be concise and specific
82+
83+
* Use Conventional Comments to hint what the feedback is
84+
85+
* Prefer “Consider…” or “What do you think about…” over “This is wrong”
86+
87+
* When suggesting a change, always explain _why_ it improves the code
88+
89+
* Use code snippets in suggestions when helpful and would change less than 10 lines of code.
90+
91+
92+
# Overall Review Summary
93+
94+
When appropriate, provide a short summary comment that answers:
95+
96+
* Is this change safe to merge?
97+
98+
* What are the main risks (if any)?
99+
100+
* Are there follow-ups worth tracking separately?

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ updates:
1919
- dependency-name: '@mozmeao/cookie-helper'
2020
- dependency-name: '@mozmeao/dnt-helper'
2121
- dependency-name: '@mozmeao/trafficcop'
22+
# Pin sass at 1.91.0 until mozilla/protocol#982
23+
- dependency-name: 'sass'
2224
# Need to be kept in sync with pre-commit-config.yaml.
2325
- dependency-name: 'eslint'
2426
- dependency-name: 'eslint-config-prettier'

.github/l10n/check_toml_configs.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/env python
2+
3+
# This Source Code Form is subject to the terms of the Mozilla Public
4+
# License, v. 2.0. If a copy of the MPL was not distributed with this
5+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
6+
7+
import argparse
8+
import os
9+
import sys
10+
from pathlib import Path
11+
12+
from moz.l10n.paths import L10nConfigPaths
13+
14+
15+
def main():
16+
parser = argparse.ArgumentParser()
17+
parser.add_argument("--path", dest="repo_path", help="Path to repository clone", required=True)
18+
args = parser.parse_args()
19+
20+
# Find all TOML files in l10n/configs
21+
repo_path = args.repo_path
22+
config_path = Path(os.path.join(repo_path, "l10n", "configs"))
23+
config_files = list(config_path.glob("*.toml"))
24+
25+
errors = []
26+
for config in config_files:
27+
toml_path = os.path.join(repo_path, config)
28+
project_config_paths = L10nConfigPaths(toml_path)
29+
reference_files = [os.path.abspath(ref_path) for ref_path in project_config_paths.ref_paths]
30+
31+
for file in reference_files:
32+
if not os.path.exists(file):
33+
errors.append(f"[{config}] {os.path.relpath(file, repo_path)}")
34+
35+
if errors:
36+
print("Missing reference files:")
37+
for error in errors:
38+
print(f" {error}")
39+
sys.exit(1)
40+
else:
41+
print("No missing reference files.")
42+
43+
44+
if __name__ == "__main__":
45+
main()

0 commit comments

Comments
 (0)