-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into split_df_mode
* main: test(CI): Add merge queue support for faster PR testing (#1265) fix(panel_conditional): Include `.shiny-panel-conditional` class (#1257)
- Loading branch information
Showing
8 changed files
with
86 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
name: 'Custom merge queue browsers' | ||
description: 'Trim down pytest browsers for any github event other than merge_group.' | ||
inputs: | ||
all-browsers: | ||
description: 'Force all pytest browsers to used when testing' | ||
required: false | ||
default: 'false' | ||
outputs: | ||
browsers: | ||
description: 'pytest browsers to use' | ||
value: ${{ steps.browsers.outputs.browsers }} | ||
runs: | ||
using: "composite" | ||
steps: | ||
- name: Determine browsers to use | ||
shell: bash | ||
id: browsers | ||
run: | | ||
if [ "${{ inputs.all-browsers }}" == "true" ]; then | ||
echo "Using all browsers!" | ||
exit 0 | ||
fi | ||
if [ "${{ github.event_name }}" == "pull_request" ]; then | ||
echo "Using chrome browser only!" | ||
echo 'browsers=PYTEST_BROWSERS="--browser chromium"' >> "$GITHUB_OUTPUT" | ||
fi | ||
echo "No custom pytest browsers!" | ||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
[pytest] | ||
asyncio_mode=strict | ||
testpaths=tests/pytest/ | ||
addopts = --strict-markers --durations=6 --durations-min=5.0 --browser webkit --browser firefox --browser chromium --numprocesses auto --tracing=retain-on-failure --video=retain-on-failure | ||
; Note: Browsers are set within `./Makefile` | ||
addopts = --strict-markers --durations=6 --durations-min=5.0 --numprocesses auto --tracing=retain-on-failure --video=retain-on-failure |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters