Skip to content

Commit 38f57b3

Browse files
committed
Merge branch dev into published
2 parents 94835fb + fae7d4c commit 38f57b3

File tree

8 files changed

+12
-36
lines changed

8 files changed

+12
-36
lines changed

.circleci/config.yml

-8
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@ jobs:
237237
- run:
238238
name: Run VSIX E2E Tests
239239
command: npm run e2e-test -- --calva-vsix=/tmp/artifacts/calva-$( node -p 'require("./package.json").version' ).vsix --test-workspace=src/extension-test/e2e-test
240-
- run:
241-
name: Temporary debug preserving of VS Code network log
242-
command: for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do echo "$f"; echo ---; cat "$f"; echo ---; done
243-
when: always
244240
- store_test_results:
245241
path: ~/calva/junit
246242
test-e2e-sub-projects:
@@ -259,10 +255,6 @@ jobs:
259255
- run:
260256
name: Run VSIX E2E Tests for test-data/projects/e2e-sub-projects
261257
command: npm run e2e-test -- --calva-vsix=/tmp/artifacts/calva-$( node -p 'require("./package.json").version' ).vsix --test-workspace=test-data/projects/e2e-sub-projects
262-
- run:
263-
name: Temporary debug preserving of VS Code network log
264-
command: for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do echo "$f"; echo ---; cat "$f"; echo ---; done
265-
when: always
266258
- store_test_results:
267259
path: ~/calva/junit
268260
github-release:

.circleci/jobs/test-e2e-sub-projects.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,5 @@ steps:
2626
).vsix
2727
--test-workspace=test-data/projects/e2e-sub-projects
2828

29-
- run:
30-
name: Temporary debug preserving of VS Code network log
31-
command:
32-
for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do
33-
echo "$f";
34-
echo ---;
35-
cat "$f";
36-
echo ---;
37-
done
38-
when: always
39-
4029
- !store:
4130
test_results: ~/calva/junit

.circleci/jobs/test-e2e.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,5 @@ steps:
2626
).vsix
2727
--test-workspace=src/extension-test/e2e-test
2828

29-
- run:
30-
name: Temporary debug preserving of VS Code network log
31-
command:
32-
for f in /home/circleci/.config/'Code - Insiders'/logs/*/network.log; do
33-
echo "$f";
34-
echo ---;
35-
cat "$f";
36-
echo ---;
37-
done
38-
when: always
39-
4029
- !store:
4130
test_results: ~/calva/junit

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ Changes to Calva.
44

55
## [Unreleased]
66

7+
## [2.0.469] - 2024-09-10
8+
9+
- Fix: [Windows – Jack-in for shadow-cljs fails to start with "Error: spawn EINVAL" on the latest VS Code version](https://github.com/BetterThanTomorrow/calva/issues/2616)
10+
711
## [2.0.468] - 2024-09-03
812

9-
- Bump deps.clj to v1.11.3.1463
13+
- Bump deps.clj to v1.11.4.1474
1014
- [Prioritize Workspace configured connect sequences over User configured dittos](https://github.com/BetterThanTomorrow/calva/issues/2606)
1115

1216
## [2.0.467] - 2024-07-14

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Calva: Clojure & ClojureScript Interactive Programming",
44
"description": "Integrated REPL, formatter, Paredit, and more. Powered by cider-nrepl and clojure-lsp.",
55
"icon": "assets/calva.png",
6-
"version": "2.0.468",
6+
"version": "2.0.469",
77
"publisher": "betterthantomorrow",
88
"author": {
99
"name": "Better Than Tomorrow",

src/nrepl/project-types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,9 @@ const projectTypes: { [id: string]: ProjectType } = {
400400
name: 'shadow-cljs',
401401
cljsTypes: [],
402402
cmd: ['npx'],
403-
winCmd: ['npx.cmd'],
403+
winCmd: ['npx'],
404404
processShellUnix: true,
405-
processShellWin: false,
405+
processShellWin: true,
406406
useWhenExists: ['shadow-cljs.edn'],
407407
nReplPortFile: ['.shadow-cljs', 'nrepl.port'],
408408
/**
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
(a ^{} b)
2+
c

0 commit comments

Comments
 (0)