ci: Use with-connect instead of bespoke integration test setup

.github/workflows/ci.yaml

@@ -11,8 +11,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v6
+      - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v7
       - run: uv python install
       - run: make dev
       - run: make lint
@@ -31,8 +31,8 @@ jobs:
           - "3.12"
           - "3.13"
     steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v6
+      - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v7
       - run: uv python install ${{ matrix.python-version }}
       - run: make dev
       - run: make test
@@ -58,16 +58,17 @@ jobs:
       matrix:
         CONNECT_VERSION: ${{ fromJson(needs.setup-integration-test.outputs.versions) }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-buildx-action@v3
-      - name: Write Posit Connect license to disk
-        run: echo "$CONNECT_LICENSE" > ./integration/license.lic
-        env:
-          CONNECT_LICENSE: ${{ secrets.CONNECT_LICENSE }}
-      - uses: astral-sh/setup-uv@v6
+      - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v7
       - run: uv python install
-      - run: make -C ./integration ${{ matrix.CONNECT_VERSION }}
-      - uses: actions/upload-artifact@v4
+      - name: Run integration tests
+        uses: posit-dev/with-connect@main
+        with:
+          version: ${{ matrix.CONNECT_VERSION }}
+          license: ${{ secrets.CONNECT_LICENSE }}
+          command:
+            make -C ./integration test-${{ matrix.CONNECT_VERSION }}
+      - uses: actions/upload-artifact@v5
         if: always()
         with:
           name: ${{ matrix.CONNECT_VERSION }} - Integration Test Report
@@ -81,7 +82,7 @@ jobs:
       pull-requests: write
     if: always()
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           path: artifacts
       - uses: EnricoMi/publish-unit-test-result-action@v2
@@ -94,8 +95,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v6
+      - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v7
       - run: uv python install
       - run: make dev
       - run: make build

Makefile

@@ -2,7 +2,7 @@ include vars.mk
 
 .DEFAULT_GOAL := all
 
-.PHONY: build clean cov default dev docker-deps docs ensure-uv fmt fix install it lint test uninstall version help
+.PHONY: build clean cov default dev docs ensure-uv fmt fix install it lint test uninstall version help
 
 $(UV_LOCK): dev
 	$(UV) lock
@@ -35,12 +35,6 @@ cov-xml: dev
 dev: ensure-uv
 	$(UV) pip install --upgrade -e .
 
-docker-deps: ensure-uv
-	# Sync given the `uv.lock` file
-	# --frozen : assert that the lock file exists
-	# --no-install-project : do not install the project itself, but install its dependencies
-	$(UV) sync --frozen --no-install-project
-
 docs: ensure-uv
 	$(MAKE) -C ./docs
 

integration/Makefile

@@ -1,31 +1,26 @@
 include ../vars.mk
 
-# Docker settings
-DOCKER_COMPOSE ?= docker compose
-DOCKER_CONNECT_IMAGE ?= rstudio/rstudio-connect
-DOCKER_PROJECT_IMAGE_TAG ?= $(PROJECT_NAME):latest
-
-# Connect settings
-CONNECT_BOOTSTRAP_SECRETKEY ?= $(shell head -c 32 /dev/random | base64)
-
 # pytest settings
 PYTEST_ARGS ?= "-s"
 
 .DEFAULT_GOAL := latest
 
+define GET_PORT
+$(UV) run -- python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'
+endef
+
 .PHONY: $(CONNECT_VERSIONS) \
 	all \
-	build \
-	down \
-	down-% \
+	clean \
 	latest \
-	test \
-	up \
-	up-% \
-	help
+	print-versions \
+	help \
+	test-%
 
 # Versions
 CONNECT_VERSIONS := \
+	2025.10.0 \
+	2025.09.1 \
 	2025.07.0 \
 	2025.06.0 \
 	2025.05.0 \
@@ -59,88 +54,46 @@ clean:
 	rm -rf logs reports
 	find . -type d -empty -delete
 
-# Run test suite for a specific Connect version.
-$(CONNECT_VERSIONS): %: down-% up-%
+# Run pytest for a specific version (assumes Connect is already running).
+test-%:
+	@mkdir -p logs reports
+	$(UV) run pytest $(PYTEST_ARGS) \
+		--junitxml=reports/junit-$*.xml | tee logs/$*.log
+
+# Spin up Connect for a specific version and run tests.
+$(CONNECT_VERSIONS): %:
+	PORT=$$($(GET_PORT)); \
+	uv run --with https://github.com/posit-dev/with-connect.git \
+		with-connect --version $* --port $$PORT \
+		-- $(MAKE) test-$*
 
 # Run test suite against all Connect versions.
-all: $(CONNECT_VERSIONS:%=%) preview
+all: $(CONNECT_VERSIONS:%=%)
 
 # Run test suite against latest Connect version.
 latest:
 	$(MAKE) $(firstword $(CONNECT_VERSIONS))
 
-# Run test suite against preview Connect version.
-preview:
-	$(MAKE) \
-	DOCKER_CONNECT_IMAGE=rstudio/rstudio-connect-preview \
-	DOCKER_CONNECT_IMAGE_TAG=dev-jammy-daily \
-	down-preview up-preview
-
-# Build Dockerfile
-build:
-	make -C .. $(UV_LOCK)
-	docker build -t $(DOCKER_PROJECT_IMAGE_TAG) ..
-
-# Tear down resources.
-down: $(CONNECT_VERSIONS:%=down-%)
-down-%: DOCKER_CONNECT_IMAGE_TAG=jammy-$*
-down-%: CONNECT_VERSION=$*
-down-%:
-	CONNECT_BOOTSTRAP_SECRETKEY=$(CONNECT_BOOTSTRAP_SECRETKEY) \
-	CONNECT_VERSION=$* \
-	DOCKER_CONNECT_IMAGE_TAG=$(DOCKER_CONNECT_IMAGE_TAG) \
-	DOCKER_CONNECT_IMAGE=$(DOCKER_CONNECT_IMAGE) \
-	DOCKER_PROJECT_IMAGE_TAG=$(DOCKER_PROJECT_IMAGE_TAG) \
-	PYTEST_ARGS="$(PYTEST_ARGS)" \
-	$(DOCKER_COMPOSE) -p $(PROJECT_NAME)-$(subst .,-,$(CONNECT_VERSION)) down -v
-
-# Create, start, and run Docker Compose.
-up: $(CONNECT_VERSIONS:%=up-%)
-up-%: CONNECT_VERSION=$*
-up-%: DOCKER_CONNECT_IMAGE_TAG=jammy-$*
-up-%: build
-	CONNECT_BOOTSTRAP_SECRETKEY=$(CONNECT_BOOTSTRAP_SECRETKEY) \
-	CONNECT_VERSION=$* \
-	DOCKER_CONNECT_IMAGE_TAG=$(DOCKER_CONNECT_IMAGE_TAG) \
-	DOCKER_CONNECT_IMAGE=$(DOCKER_CONNECT_IMAGE) \
-	DOCKER_PROJECT_IMAGE_TAG=$(DOCKER_PROJECT_IMAGE_TAG) \
-	PYTEST_ARGS="$(PYTEST_ARGS)" \
-	$(DOCKER_COMPOSE) -p $(PROJECT_NAME)-$(subst .,-,$(CONNECT_VERSION)) up -V --abort-on-container-exit --no-build
-
 # Show available versions
 print-versions:
 	@printf "%s\n" $(strip $(CONNECT_VERSIONS))
 
 # Show help message.
 help:
 	@echo "Makefile Targets:"
-	@echo "  all (default)    Run test suite for all Connect versions."
-	@echo "  latest           Run test suite for latest Connect version."
-	@echo "  preview          Run test suite for preview Connect version."
-	@echo "  <version>        Run test suite for the specified Connect version. (e.g., make 2024.05.0)"
-	@echo "  up               Start Docker Compose for all Connect versions."
-	@echo "  down             Tear down Docker resources for all Connect versions."
-	@echo "  clean            Clean up the project directory."
+	@echo "  latest (default) Run test suite for latest Connect version."
+	@echo "  all              Run test suite for all Connect versions."
+	@echo "  <version>        Run test suite for the specified Connect version. (e.g., make 2025.10.0)"
+	@echo "  clean            Clean up logs and reports directories."
 	@echo "  print-versions   Show the available Connect versions."
 	@echo "  help             Show this help message."
 	@echo
 	@echo "Common Usage:"
-	@echo "  make -j 4        Run test suite in parallel for all Connect versions."
+	@echo "  make             Run test suite for latest Connect version (default)."
 	@echo "  make latest      Run test suite for latest Connect version."
-	@echo "  make preview     Run test suite for preview Connect version."
-	@echo "  make 2024.05.0   Run test suite for specific Connect version."
+	@echo "  make 2025.10.0   Run test suite for specific Connect version."
+	@echo "  make all         Run test suite for all Connect versions."
+	@echo "  make -j 4 all    Run test suite in parallel for all Connect versions."
 	@echo
 	@echo "Environment Variables:"
-	@echo "  DOCKER_COMPOSE           Command to invoke Docker Compose. Default: docker compose"
-	@echo "  DOCKER_CONNECT_IMAGE     Docker image name for Connect. Default: rstudio/rstudio-connect"
-	@echo "  DOCKER_PROJECT_IMAGE_TAG Docker image name and tag for the project image. Default: $(PROJECT_NAME):latest"
-	@echo "  PYTEST_ARGS              Arguments to pass to pytest. Default: \"-s\""
-
-# Run tests.
-test:
-	mkdir -p logs
-	set -o pipefail; \
-	CONNECT_VERSION=${CONNECT_VERSION} \
-		CONNECT_API_KEY="$(shell $(UV) run rsconnect bootstrap -i -s http://connect:3939 --raw)" \
-		$(UV) run pytest $(PYTEST_ARGS) --junit-xml=./reports/$(CONNECT_VERSION).xml | \
-		tee ./logs/$(CONNECT_VERSION).log;
+	@echo "  PYTEST_ARGS      Arguments to pass to pytest. Default: \"-s\""