Skip to content

Commit 65bee03

Browse files
readd lost changes during main merge
1 parent 8e190d4 commit 65bee03

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/l10n.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: L10N Test Execution
33

44
run-name: ${{ github.actor }} is running l10n tests
55
on:
6+
pull_request:
67
workflow_call:
78
inputs:
89
channel:
@@ -37,7 +38,7 @@ env:
3738

3839
jobs:
3940
L10N-MacOS:
40-
if: ${{ inputs.job_to_run == 'L10N-MacOS' || inputs.mac_installer_link }}
41+
if: ${{ inputs.job_to_run == 'L10N-MacOS' || github.event_name == 'pull_request' || inputs.mac_installer_link }}
4142
runs-on: macos-latest
4243
steps:
4344
- name: Create app token
@@ -85,7 +86,7 @@ jobs:
8586
run: |
8687
"$FX_EXECUTABLE" --version;
8788
echo "0" > TEST_EXIT_CODE;
88-
pipenv run python check_l10n_test_cases.py;
89+
pipenv run python choose_l10n_ci_set.py;
8990
while IFS= read -r line; do
9091
echo "Running tests for: $line";
9192
pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
@@ -121,7 +122,7 @@ jobs:
121122
name: artifacts-mac
122123
path: artifacts-mac
123124
L10N-Linux:
124-
if: ${{ inputs.job_to_run == 'L10N-Linux' || inputs.linux_tarball_link }}
125+
if: ${{ inputs.job_to_run == 'L10N-Linux' || github.event_name == 'pull_request' || inputs.linux_tarball_link }}
125126
runs-on: ubuntu-latest
126127
steps:
127128
- name: Create app token
@@ -166,7 +167,7 @@ jobs:
166167
run: |
167168
"$FX_EXECUTABLE" --version;
168169
echo "0" > TEST_EXIT_CODE;
169-
pipenv run python check_l10n_test_cases.py;
170+
pipenv run python choose_l10n_ci_set.py;
170171
Xvfb :99 -screen 0 '1600x1200x24' > artifacts/xvfb.log &
171172
while IFS= read -r line; do
172173
echo "Running tests for: $line";
@@ -203,7 +204,7 @@ jobs:
203204
name: artifacts-linux
204205
path: artifacts-linux
205206
L10N-Windows:
206-
if: ${{ inputs.job_to_run == 'L10N-Windows' || inputs.win_installer_link }}
207+
if: ${{ inputs.job_to_run == 'L10N-Windows' || github.event_name == 'pull_request' || inputs.win_installer_link }}
207208
runs-on: windows-latest
208209
steps:
209210
- name: Create app token
@@ -277,7 +278,7 @@ jobs:
277278
pipenv run python -c "import sys; print(sys.platform)"
278279
$env:FX_EXECUTABLE = 'C:\Program Files\Custom Firefox\firefox.exe'
279280
Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
280-
pipenv run python check_l10n_test_cases.py
281+
pipenv run python choose_l10n_ci_set.py
281282
"0" | Set-Content -Path "TEST_EXIT_CODE"
282283
$SCRIPT_EXIT_CODE = 0
283284
Get-Content "selected_l10n_mappings" | ForEach-Object {
@@ -304,7 +305,7 @@ jobs:
304305
mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
305306
$env:FX_EXECUTABLE = 'C:\Program Files\Custom Firefox\firefox.exe'
306307
Write-Host "FX_EXECUTABLE: $FX_EXECUTABLE"
307-
pipenv run python check_l10n_test_cases.py
308+
pipenv run python choose_l10n_ci_set.py
308309
"0" | Set-Content -Path "TEST_EXIT_CODE"
309310
$SCRIPT_EXIT_CODE = 0
310311
Get-Content "selected_l10n_mappings" | ForEach-Object {

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ drivers/
192192
temp.py
193193
tests/test_scratch.py
194194

195+
# L10N files
196+
selected_l10n_mappings
197+
195198
# Credentials
196199
credentials.json
197200
testrail_credentials.env

0 commit comments

Comments
 (0)