Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
110 changes: 0 additions & 110 deletions .github/workflows/deploy_tests.yml

This file was deleted.

85 changes: 0 additions & 85 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ jobs:
id: create_dist
env:
PACKAGE_NAME: ${{ matrix.package_name }}
- uses: actions/upload-artifact@v4
with:
name: distributions
path: dist/
if: matrix.package_name == 'rsconnect_python'
- run: pip install -vvv ${{ steps.create_dist.outputs.whl }}
- run: rsconnect version
- run: rsconnect --help
Expand Down Expand Up @@ -172,83 +167,3 @@ jobs:
run: |
pytest tests/test_main_system_caches.py
pytest -m 'vetiver'

test-connect:
needs: distributions
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
PY_VERSION:
- 3.11.13
- 3.12.11
steps:
- uses: extractions/setup-just@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v4
with:
fetch-depth: 0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Checkout the rsconnect-python tests from Connect
- uses: actions/checkout@v4
with:
repository: rstudio/connect
path: 'test/connect-rsconnect-python'
sparse-checkout: |
test/rsconnect-python
tools/dev
examples
sparse-checkout-cone-mode: false
token: ${{ secrets.CONNECT_PAT }}

- name: Delete dotnet to save space
run: sudo rm -rf /usr/share/dotnet

- name: Build docker container-image
run: |
cd test/connect-rsconnect-python/test/rsconnect-python/
docker compose --profile rsconnect build

- name: Restore dist
uses: actions/download-artifact@v4
with:
name: distributions
path: dist/

- name: Run rsconnect-python Tests
env:
CONNECT_LICENSE: "${{ secrets.RSC_LICENSE }}"
PY_VERSION: ${{ matrix.PY_VERSION }}
TEST_SUBSET: "CI"
RSC_AUTOMATION_PAT: "${{ secrets.CONNECT_PAT }}"
ADMIN_API_KEY: "${{ secrets.ADMIN_API_KEY }}"
QUARTO_VERSION: "1.4.546"

# This allows us to start Connect separately in our own docker container
CONNECT_SERVER: "http://localhost:3939"
remote: "yes"
run: |
cd integration-testing
docker compose pull connect
docker compose up -d connect
just ../test/connect-rsconnect-python/test/rsconnect-python/test-rsconnect-python-repo
Copy link
Contributor

Choose a reason for hiding this comment

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

Once this merges, we can tidy up this justfile in connect and at least remove this target, which nothing else calls. Probably worth doing an audit there of any other stuff, like in the docker compose setup, to see if there's more that we can prune.

Copy link
Contributor

Choose a reason for hiding this comment

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

rsconnect-repo hits a few other things in connect, including in the docker-compose.yml. I think that's the thread to tug on.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Connect ticket for this follow up work: https://github.com/posit-dev/connect/issues/34626


# Videos are captured whether the suite fails or passes
- name: Save videos
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-videos_${{ matrix.PY_VERSION }}_native
path: test/connect-rsconnect-python/cypress/videos
if-no-files-found: ignore

# Screenshots are only captured on failure
- name: Save screenshots
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots_${{ matrix.PY_VERSION }}_native
path: test/connect-rsconnect-python/cypress/screenshots
if-no-files-found: ignore
Loading