Skip to content

Commit 1f9b108

Browse files
Merge pull request #674 from mozilla/philimon/l10n_remove_default
Philimon/l10n_remove_default_mapping
2 parents 7ae738b + ae101b1 commit 1f9b108

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/l10n.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
echo "Running tests for: $line";
110110
pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
111111
done < selected_l10n_mappings;
112+
ls artifacts-mac/* &>/dev/null || echo "No mappings to report" >> artifacts-mac/placeholder.txt
112113
mv -n artifacts/* artifacts-mac/ || true;
113114
EXIT_CODE=$(cat TEST_EXIT_CODE);
114115
if [ $EXIT_CODE != 0 ]; then
@@ -191,6 +192,7 @@ jobs:
191192
echo "Running tests for: $line";
192193
DISPLAY=:99 pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
193194
done < selected_l10n_mappings;
195+
ls artifacts-linux/* &>/dev/null || echo "No mappings to report" >> artifacts-linux/placeholder.txt
194196
mv -n artifacts/* artifacts-linux/ || true;
195197
EXIT_CODE=$(cat TEST_EXIT_CODE);
196198
if [ $EXIT_CODE != 0 ]; then
@@ -317,8 +319,8 @@ jobs:
317319
$SCRIPT_EXIT_CODE = $_.Exception.HResult
318320
}
319321
}
320-
rm artifacts/assets -r -Force
321-
Get-ChildItem -Path "artifacts" | ForEach-Object {
322+
rm artifacts/assets -r -Force -ErrorAction SilentlyContinue
323+
Get-ChildItem -Path "artifacts" -ErrorAction SilentlyContinue | ForEach-Object {
322324
$destPath = "artifacts-win\" + $_.Name
323325
if (-not (Test-Path -Path $destPath)) {
324326
try {
@@ -328,6 +330,10 @@ jobs:
328330
}
329331
}
330332
}
333+
mkdir artifacts-win -Force
334+
if (-not (Test-Path -Path "artifacts-win\*")) {
335+
New-Item -Path "artifacts-win\placeholder.txt" -ItemType File -Value "no mappings to report."
336+
}
331337
$EXIT_CODE = Get-Content -Path "TEST_EXIT_CODE"
332338
if ($EXIT_CODE -ne 0) {
333339
exit [int]$EXIT_CODE
@@ -363,7 +369,7 @@ jobs:
363369
with:
364370
name: artifacts-win
365371
path: artifacts-win
366-
- name: Download Windows artifact
372+
- name: Download Linux artifact
367373
uses: actions/download-artifact@v4
368374
with:
369375
name: artifacts-linux

choose_l10n_ci_set.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ def process_changed_file(f, selected_mappings):
135135

136136
# Run all the tests for all mappings if any core l10n model, component, conftest, or tests are changed.
137137
selected_mappings = defaultdict(set)
138-
# by default, have the demo page run for US
139-
selected_mappings["demo"] = {"US"}
140138
for f in committed_files:
141139
for re_val in re_set_all:
142140
if re_val.match(f):

0 commit comments

Comments
 (0)