Skip to content

Commit 2166b7f

Browse files
authored
write test_set input directly to STARFOX_SPLIT (#967)
1 parent c3f6454 commit 2166b7f

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838
type: string
3939
env:
4040
FX_CHANNEL: ${{ inputs.channel }}
41-
TEST_SET: ${{ inputs.test_set }}
41+
STARFOX_SPLIT: ${{ inputs.test_set }}
4242
TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
4343
TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
4444
TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
@@ -65,11 +65,6 @@ jobs:
6565
run: |
6666
echo "TESTRAIL_REPORT=true" | Out-File -FilePath .env -Encoding utf8 -Append -Force
6767
Write-Host "Running report for most recent Beta on Windows"
68-
- name: Select Test Set
69-
if: ${{ inputs.test_set != null }}
70-
run: |
71-
echo "STARFOX_SPLIT=$TEST_SET" | Out-File -FilePath .env -Encoding utf8 -Append -Force
72-
shell: pwsh
7368
- name: Install dependencies
7469
run: |
7570
mkdir -p artifacts;
@@ -168,9 +163,6 @@ jobs:
168163
run: |
169164
echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
170165
echo "Running report for most recent Beta on MacOS";
171-
- name: Select Test Set
172-
if: ${{ inputs.test_set != null }}
173-
run: echo "STARFOX_SPLIT=$TEST_SET" >> .env
174166
- name: Set Environment (Manual)
175167
if: ${{ inputs.mac_installer_link }}
176168
run: |

modules/testrail_integration.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,8 @@ def reportable(platform_to_test=None):
292292
)
293293

294294
if not os.environ.get("STARFOX_SPLIT"):
295-
sys.exit("No split selected")
295+
logging.warning("No split selected")
296+
return False
296297
manifest = TestKey(TEST_KEY_LOCATION)
297298
expected_suites = manifest.get_valid_suites_in_split(
298299
os.environ["STARFOX_SPLIT"], suite_numbers=True

0 commit comments

Comments
 (0)