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.

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

ci(integration): Coordinate tested assets versions #101

Merged
merged 7 commits into from
Jul 1, 2024
Merged

ci(integration): Coordinate tested assets versions #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14f21df
ci(integration): Use latest shinylive assets in r package tests
gadenbuie Jul 1, 2024
7159e31
ci(integration): Match `py-shinylive` assets version in Quarto integr…
gadenbuie Jul 1, 2024
525dbb9
ci(integration): Also do Quarto integration test with latest shinyliv…
gadenbuie Jul 1, 2024
90106c4
ci(integration): Test latest shinylive assets _after_ py-shinylive sh…
gadenbuie Jul 1, 2024
31522e1
tests(quarto_ext): Expect `assets_ensure()` downloads `assets_version…
gadenbuie Jul 1, 2024
e8ab3f5
ci(integration): Test r/py-shinylive in quarto earlier to ensure rele…
gadenbuie Jul 1, 2024
e296451
ci: ensure old cached assets are cleaned up before linking to new asstes
gadenbuie Jul 1, 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
29 changes: 26 additions & 3 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ jobs:
python -m pip install --upgrade pip

- name: Install py-shinylive
id: py-shinylive
shell: bash
run: |
pip install shinylive
# pip install https://github.com/posit-dev/py-shinylive/archive/split_api.zip
echo "version=$(shinylive assets version)" >> "$GITHUB_OUTPUT"

- name: Set up Quarto
uses: quarto-dev/quarto-actions/setup@v2
Expand All @@ -58,6 +60,13 @@ jobs:
with:
needs: quarto

- name: Test shinylive quarto extension with py-shinylive assets version
uses: quarto-dev/quarto-actions/render@v2
env:
SHINYLIVE_ASSETS_VERSION: ${{ steps.py-shinylive.outputs.version }}
with:
path: local/quarto/

- name: Check out 'posit-dev/shinylive' repo into './shinylive_assets'
uses: actions/checkout@v4
with:
Expand All @@ -72,10 +81,20 @@ jobs:
make all

- name: Link shinylive assets
id: r-linked-assets
shell: Rscript {0}
run: |
shinylive_local_version <- shinylive:::package_json_version("shinylive_assets")
shinylive::assets_remove(shinylive_local_version)
shinylive::assets_install_copy("shinylive_assets")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could use the py-shinylive assets version here, but that would lead to confusing testing. Instead, a proper and reasonable solution would be to update py-shinylive to support --assets-version in CLI to use different versions when exporting.

shinylive::assets_info()
cat(
"version=", shinylive_local_version,
file = Sys.getenv("GITHUB_OUTPUT"),
append = TRUE,
sep = ""
)

- name: Update lua script for debugging
shell: Rscript {0}
run: |
Expand Down Expand Up @@ -104,6 +123,7 @@ jobs:
- name: Run shinylive R package tests
env:
TEST_ASSETS: "TRUE"
SHINYLIVE_ASSETS_VERSION: ${{ steps.r-linked-assets.outputs.version }}
shell: Rscript {0}
run: |
shinylive::assets_info()
Expand All @@ -114,10 +134,13 @@ jobs:
shinylive::assets_ensure()

testthat::test_local()
# If this (^^) completes, it is a big success!
# Run quarto test after testthat test
- name: Test shinylive quarto extension can build

- name: Test shinylive quarto extension with latest shinylive assets
uses: quarto-dev/quarto-actions/render@v2
env:
# TODO: py-shinylive doesn't follow this envvar yet. If shinylive
# has a newer version, this action will fail.
SHINYLIVE_ASSETS_VERSION: ${{ steps.r-linked-assets.outputs.version }}
with:
path: local/quarto/

Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-quarto_ext.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ test_that("quarto_ext handles `extension info`", {
}))
info <- jsonlite::parse_json(txt)
expect_equal(info$version, as.character(utils::packageVersion("shinylive")))
expect_equal(info$assets_version, SHINYLIVE_ASSETS_VERSION)
expect_equal(info$assets_version, assets_version())

expect_true(
is.list(info$scripts) &&
Expand Down
Loading