Skip to content

revised the channel addition, logic untouched #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arash-e-at-moz merged 3 commits into from
Dec 11, 2025
Merged

revised the channel addition, logic untouched #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5f6986
revised the channel addition, logic untouched
arash-e-at-moz Dec 11, 2025
8d735aa
replaced smoke with starfox
arash-e-at-moz Dec 11, 2025
452d223
Merge branch 'main' into arash/revise-choose-test-channel
arash-e-at-moz Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-dispatch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
echo channels=$(python3 choose_test_channel.py) >> "$GITHUB_OUTPUT"


Run-Smoke-Win:
Run-Starfox-Win:
needs: Select-Channels
if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke')
if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'starfox')
uses: ./.github/workflows/main.yml
with:
job_to_run: Test-Windows
is_pull_request: true
secrets: inherit

Run-Smoke-Mac:
Run-Starfox-Mac:
needs: Select-Channels
if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke')
if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'starfox')
uses: ./.github/workflows/main.yml
with:
job_to_run: Test-MacOS
Expand Down
18 changes: 9 additions & 9 deletions choose_test_channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import sys
from subprocess import check_output

ALL_CHANNELS = ["smoke", "l10n", "functional"]
ALL_CHANNELS = ["starfox", "l10n"]
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
SLASH = "/" if "/" in SCRIPT_DIR else "\\"

file_subsets = {
"smoke": ["modules/data", "modules/page", "modules/browser", "tests/"],
"starfox": ["modules/data", "modules/page", "modules/browser", "tests/"],
"l10n": ["l10n_CM/"],
}

Expand Down Expand Up @@ -44,7 +44,7 @@
main_conftest = "conftest.py"
base_page = os.path.join("modules", "page_base.py")

channels = []
channels = set()

if main_conftest in committed_files or base_page in committed_files:
print(ALL_CHANNELS)
Expand All @@ -55,11 +55,11 @@
print(ALL_CHANNELS)
sys.exit()

for test_channel in file_subsets:
for subset in file_subsets[test_channel]:
if subset in f and test_channel not in channels:
channels.append(test_channel)
for test_channel, subset in file_subsets.items():
if any(s in c for s in subset for c in committed_files):
channels.add(test_channel)

if not channels:
channels = ["smoke"]
print(channels)
channels = {"starfox"}

print(list(channels))