Skip to content

Commit 3092eb2

Browse files
committed
workflow: Fix vscode-pr workflow
1 parent 84a7f61 commit 3092eb2

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.devcontainer/tools.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ PY$(subst .,,$1) := $$(BIN)/python$1
6565

6666
$$(PY$(subst .,,$1)): | $$(UV)
6767
$$(UV) python find $1 || $$(UV) python install $1
68-
ln -s $$$$($$(UV) python find $1) $$@
69-
7068
$$@ --version
7169

7270
endif

.github/workflows/vscode-pr.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ jobs:
7272
test:
7373
name: "Python v${{ matrix.python-version }}"
7474
runs-on: ubuntu-latest
75+
# container:
76+
# image: ghcr.io/swyddfa/esbonio-devenv
77+
# credentials:
78+
# username: ${{ github.actor }}
79+
# password: ${{ secrets.github_token }}
80+
7581
timeout-minutes: 20
7682
strategy:
7783
fail-fast: false
@@ -94,7 +100,7 @@ jobs:
94100
allow-prereleases: true
95101

96102
- run: |
97-
cd code/
103+
cd code
98104
make dev-deps
99105
npx tsc -p .
100106

code/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ include ../.devcontainer/tools.mk
22

33
ESBONIO ?= --pre esbonio
44

5+
export PATH := $(BIN):$(PATH)
6+
57
.PHONY: clean
68
clean:
79
rm -r bundled node_modules dist
810

911
.PHONY: test
10-
test: dev-deps $(NPM)
12+
test: dev-deps | $(NPM)
1113
-test -d dist && rm -r dist
1214
$(NPX) tsc -p .
1315
$(NPM) run test

0 commit comments

Comments
 (0)