Skip to content
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.

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

debug(ci): Run draft / PR tests #1564

Merged
merged 43 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
1b821f5
Update end-to-end.yaml
schloerke Jul 22, 2024
b126c4b
bash quote typo
schloerke Jul 22, 2024
253b519
Actually test on os value
schloerke Jul 22, 2024
a4ce621
Add os value support
schloerke Jul 22, 2024
7fddf7e
debug if inline if values are converted to boolean or the value is kept
schloerke Jul 22, 2024
9aa9a49
Try using exclusion approach to avoid needing config pre-job
schloerke Jul 22, 2024
3997a8a
Update end-to-end.yaml
schloerke Jul 22, 2024
b1fc3f4
Exclude macos and windows and py 3.9, 3.10, 3.11 on draft
schloerke Jul 22, 2024
dab82c5
Update pytest.yaml
schloerke Jul 22, 2024
b526946
Try installing packags via `uv` and not `pip`
schloerke Jul 22, 2024
8a26643
Add a virtual environment and enable it before calling `make` commands
schloerke Jul 22, 2024
7e5afe6
Update end-to-end.yaml
schloerke Jul 22, 2024
cbbd1fa
Update action.yaml
schloerke Jul 22, 2024
7ce08b0
Call `make` commands directly
schloerke Jul 22, 2024
196df9f
Update action.yaml
schloerke Jul 22, 2024
6236460
Try activating and calling make
schloerke Jul 22, 2024
2be8143
Update action.yaml
schloerke Jul 22, 2024
a76573a
Update action.yaml
schloerke Jul 22, 2024
8ea356d
Update action.yaml
schloerke Jul 22, 2024
4189187
Use `venv` folder for docs
schloerke Jul 22, 2024
c861ca6
Update action.yaml
schloerke Jul 22, 2024
64bc852
Update action.yaml
schloerke Jul 22, 2024
6573575
Use `. venv/bin/activate` syntax
schloerke Jul 22, 2024
354c575
Do not require make playwright-deploys to install rsconnect
schloerke Jul 22, 2024
5a2a521
`rsconnect_python` not `rsconnect`
schloerke Jul 22, 2024
9b4598d
Try with 4 processes
schloerke Jul 22, 2024
73aec21
Update end-to-end.yaml
schloerke Jul 22, 2024
2b13520
Update playwright.yaml
schloerke Jul 22, 2024
b6f5210
Add types for pull request
schloerke Jul 22, 2024
1156fda
Move playwright tests back into `pytest.yaml`
schloerke Jul 22, 2024
8a9383e
Do not run playwright on release
schloerke Jul 22, 2024
dcbe241
Test using bash shell (windows)
schloerke Jul 22, 2024
01095b5
Use windows friendly commands
schloerke Jul 22, 2024
09fd6d9
Updated inline if syntax
schloerke Jul 22, 2024
f61fa3e
Windows path update
schloerke Jul 23, 2024
453dc37
Allow uv to use the system Python by default
schloerke Jul 23, 2024
cd87d8b
Clean up
schloerke Jul 23, 2024
7070673
Skip tests that fail on windows due to temp file ownership issues
schloerke Jul 23, 2024
bf3b985
Relocate `skip_on_windows`
schloerke Jul 23, 2024
3b19a4d
Remove unnecessary rsconnect install
schloerke Jul 23, 2024
f64b345
Work here?
schloerke Jul 23, 2024
7efb210
isort
schloerke Jul 23, 2024
08883c4
Move commands into make files; Remove remaining merge queue commands
schloerke Jul 23, 2024
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
6 changes: 3 additions & 3 deletions .github/py-shiny/pytest-browsers/action.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Custom merge queue browsers'
description: 'Trim down pytest browsers for any github event other than merge_group.'
name: 'Trim down pytest browsers'
description: 'Trim down pytest browsers so the browser tabs are not shut down between tests, speeding up testing.'
inputs:
browser:
description: 'Browser to use for testing'
Expand All @@ -24,7 +24,7 @@ runs:
BROWSER="${{ inputs.browser }}"
if [ "$BROWSER" == "chromium" ] || [ "$BROWSER" == "firefox" ] || [ "$BROWSER" == "webkit" ]; then
echo "Using custom browser $BROWSER !"
echo 'browsers=PYTEST_BROWSERS="--browser $BROWSER"' >> "$GITHUB_OUTPUT"
echo "browsers=PYTEST_BROWSERS=\"--browser $BROWSER\"" >> "$GITHUB_OUTPUT"
exit 0
fi
echo "Unknown browser: $BROWSER"
Expand Down
28 changes: 15 additions & 13 deletions .github/py-shiny/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,40 @@ runs:
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}
# # Caching with pip only saves ~15 seconds. Not work risks of confusion.
# cache: 'pip'
# cache-dependency-path: |
# setup.cfg

- name: Upgrade pip
- name: Upgrade `pip`
shell: bash
run: python -m pip install --upgrade pip
run: |
python -m pip install --upgrade pip

- name: Pip list
- name: Install `uv`
shell: bash
run: |
pip install uv

# https://github.com/astral-sh/uv/blob/main/docs/guides/integration/github.md#using-uv-pip
- name: Allow uv to use the system Python by default
shell: bash
run: |
pip list
echo "UV_SYSTEM_PYTHON=1" >> $GITHUB_ENV

- name: Install dependencies
shell: bash
run: |
pip install https://github.com/rstudio/py-htmltools/tarball/main
make install-deps
make ci-install-deps

- name: Install
shell: bash
run: |
make install
make ci-install-wheel

- name: Install backports.tarfile
if: ${{ startsWith(inputs.python-version, '3.8') }}
shell: bash
run: |
pip install backports.tarfile
uv pip install backports.tarfile

- name: Pip list
shell: bash
run: |
pip list
uv pip list
21 changes: 6 additions & 15 deletions .github/workflows/build-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
push:
branches: ["main"]
pull_request:
merge_group:

jobs:
build-docs:
Expand All @@ -18,14 +17,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
- name: Setup py-shiny
uses: ./.github/py-shiny/setup
with:
python-version: ${{ matrix.python-version }}

- name: Upgrade pip
run: python -m pip install --upgrade pip

# =====================================================
# API docs
# =====================================================
Expand All @@ -36,14 +32,11 @@ jobs:

- name: Install dependencies
run: |
cd docs
make ../venv
make deps
make ci-install-docs

- name: Run quartodoc
run: |
cd docs
make quartodoc
make docs-quartodoc

# =====================================================
# Shinylive
Expand Down Expand Up @@ -73,16 +66,14 @@ jobs:
- name: Use local build of shinylive for building docs
if: github.ref == 'refs/heads/main'
run: |
. venv/bin/activate
cd shinylive-repo
shinylive assets install-from-local ./build
cd shinylive-repo && shinylive assets install-from-local ./build

# =====================================================
# Build site
# =====================================================

- name: Build site
if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' || startsWith(github.head_ref, 'docs') }}
if: ${{ github.ref == 'refs/heads/main' || (!github.event.pull_request.draft) || startsWith(github.head_ref, 'docs') }}
run: |
cd docs
make site
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/deploy-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install rsconnect
run: |
make ci-install-rsconnect

- name: Test that deployable example apps work
timeout-minutes: 5 # ~10s locally
env:
Expand Down
160 changes: 0 additions & 160 deletions .github/workflows/end-to-end.yaml

This file was deleted.

Loading
Loading