Skip to content

Commit 73bc52e

Browse files
authored
Merge branch 'main' into philimon/fix_about_prefs_issue
2 parents a17a46b + ddb41a3 commit 73bc52e

File tree

13 files changed

+327
-327
lines changed

13 files changed

+327
-327
lines changed

.github/workflows/l10n.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,10 @@ jobs:
207207
shell: pwsh
208208
- name: Download Executable
209209
if: ${{ inputs.win_installer_link }}
210+
env:
211+
WIN_INSTALLER_LINK: ${{ inputs.win_installer_link }}
210212
run: |
211-
Invoke-WebRequest -Uri ${{ inputs.win_installer_link }} -OutFile "${{ github.workspace }}\setup.exe"
213+
Invoke-WebRequest -Uri $WIN_INSTALLER_LINK -OutFile "${{ github.workspace }}\setup.exe"
212214
New-Item -ItemType Directory -Path "C:\Program Files\Custom Firefox" -Force
213215
shell: pwsh
214216
- name: Install Beta

.github/workflows/main.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,11 @@ jobs:
9999
shell: pwsh
100100
- name: Download Executable
101101
if: ${{ inputs.win_installer_link }}
102+
env:
103+
WIN_INSTALLER_LINK: ${{ inputs.win_installer_link }}
102104
run: |
103-
echo "STARFOX_SPLIT=ci-extended" | Out-File -FilePath .env -Encoding utf8 -Append -Force
104-
Invoke-WebRequest -Uri ${{ inputs.win_installer_link }} -OutFile "${{ github.workspace }}\setup.exe"
105+
echo "STARFOX_SPLIT=smoke" | Out-File -FilePath .env -Encoding utf8 -Append -Force
106+
Invoke-WebRequest -Uri $WIN_INSTALLER_LINK -OutFile "${{ github.workspace }}\setup.exe"
105107
New-Item -ItemType Directory -Path "C:\Program Files\Custom Firefox" -Force
106108
shell: pwsh
107109
- name: Install Beta
@@ -179,7 +181,7 @@ jobs:
179181
if: ${{ inputs.mac_installer_link }}
180182
run: |
181183
echo "MANUAL='true'" >> "$GITHUB_ENV";
182-
echo "STARFOX_SPLIT=ci-extended" >> .env
184+
echo "STARFOX_SPLIT=smoke" >> .env
183185
echo "Running smoke tests on supplied executable";
184186
- name: Install dependencies
185187
run: |
@@ -243,7 +245,7 @@ jobs:
243245
MANUAL_DOWNLOAD_LINK: ${{ inputs.linux_tarball_link }}
244246
run: |
245247
echo "MANUAL='true'" >> "$GITHUB_ENV";
246-
echo "STARFOX_SPLIT=ci-extended" >> "$GITHUB_ENV"
248+
echo "STARFOX_SPLIT=smoke" >> "$GITHUB_ENV"
247249
echo "Running smoke tests on supplied executable";
248250
sudo apt install gnome-screenshot
249251
uname -m;

SELECTOR_INFO.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,6 +1923,20 @@ Location: Context menu - Tab
19231923
Path to .json: modules/data/context_menu.components.json
19241924
```
19251925
```
1926+
Selector Name: context-menu-move-tab-to-end
1927+
Selector Data: menuitem[data-l10n-id='move-to-end']
1928+
Description: Context menu option to move a tab to the end of the tab bar.
1929+
Location: Context menu - Tab
1930+
Path to .json: modules/data/context_menu.components.json
1931+
```
1932+
```
1933+
Selector Name: context-menu-move-to-new-window
1934+
Selector Data: menuitem[data-l10n-id='move-to-new-window']
1935+
Description: Context menu option to move a tab to a new window.
1936+
Location: Context menu - Tab
1937+
Path to .json: modules/data/context_menu.components.json
1938+
```
1939+
```
19261940
Selector Name: context-menu-bookmark-link
19271941
Selector Data: context-bookmarklink
19281942
Description: Context menu option to bookmark a link
@@ -1934,7 +1948,6 @@ Selector Name: context-menu-search-select
19341948
Selector Data: coontext-searchselect
19351949
Description: Context menu option to search selected text with the engine set as default
19361950
Location: Context menu - topsite context menu
1937-
Path to .json: modules/data/context_menu.components.json
19381951
```
19391952
```
19401953
Selector Name: context-menu-open-link-in-new_container_tab
@@ -3305,14 +3318,14 @@ Path to .json: modules/data/navigation.components.json
33053318
Selector Name: selected_searchbar-search-engine
33063319
Selector Data: button.searchbar-engine-one-off-item[tooltiptext='{engine}'][selected]
33073320
Description: Searchbar-search-engine
3308-
Location: Selected search bar search engine
3321+
Location: Selected search bar search engine
33093322
Path to .json: modules/data/navigation.components.json
33103323
```
33113324
```
33123325
Selector Name: searchbar-suggestions
33133326
Selector Data: hbox.search-one-offs
33143327
Description: Searchbar suggestions
3315-
Location: Searchbar results
3328+
Location: Searchbar results
33163329
Path to .json: modules/data/navigation.components.json
33173330
```
33183331
```

choose_ci_set.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ def dedupe(run_list: list) -> list:
214214
fh.write("\n".join(ci_paths))
215215
sys.exit(0)
216216

217-
if len(run_list) < MIN_RUN_SIZE:
218-
run_list.extend(ci_paths)
217+
run_list.extend(ci_paths)
219218

220219
# Dedupe just in case
221220
if SLASH == "\\":

0 commit comments

Comments
 (0)