workflow: Run tests using project devcontainer image

Author: alcarney

.devcontainer/tools.mk

@@ -65,8 +65,6 @@ PY$(subst .,,$1) := $$(BIN)/python$1
 
 $$(PY$(subst .,,$1)): | $$(UV)
 	$$(UV) python find $1 || $$(UV) python install $1
-	ln -s $$$$($$(UV) python find $1) $$@
-
 	$$@ --version
 
 endif

.github/workflows/vscode-pr.yml

@@ -72,6 +72,12 @@ jobs:
   test:
     name: "Python v${{ matrix.python-version }}"
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/swyddfa/esbonio-devenv
+      credentials:
+         username: ${{ github.actor }}
+         password: ${{ secrets.github_token }}
+
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -81,27 +87,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: 'actions/setup-node@v4'
-      with:
-        node-version: 20.x
-        cache: 'npm'
-        cache-dependency-path: 'code/package-lock.json'
-
-    - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-        allow-prereleases: true
-
     - run: |
         cd code/
-        make dev-deps
-        npx tsc -p .
-
-        # Force the extension to use this version of Python
-        python --version
-        export ESBONIO_SERVER_PYCMD=$(command -v python)
-        echo $ESBONIO_SERVER_PYCMD
-
-        xvfb-run -a npm run test
+        make test
       name: Run Tests

code/Makefile

@@ -2,15 +2,24 @@ include ../.devcontainer/tools.mk
 
 ESBONIO ?= --pre esbonio
 
+export PATH := $(BIN):$(PATH)
+
 .PHONY: clean
 clean:
 	rm -r bundled node_modules dist
 
+# Run the test suite, either locally or in CI
 .PHONY: test
-test: dev-deps $(NPM)
+test: dev-deps | $(NPM)
 	-test -d dist && rm -r dist
 	$(NPX) tsc -p .
+ifeq ($(CI),true)
+	ESBONIO_SERVER_PYCMD=$$($(UV) find python $(PYTHON_VERSION)) echo $$ESBONIO_SERVER_PYCMD
+	ESBONIO_SERVER_PYCMD=$$($(UV) find python $(PYTHON_VERSION)) xvfb-run -a $(NPM) run test
+else
 	$(NPM) run test
+endif
+
 
 .PHONY: watch
 watch: dev-deps $(NPM)