Skip to content

Commit 2e9ed8a

Browse files
committed
Merge branch dev into published
2 parents 9532e82 + 5ba70fd commit 2e9ed8a

File tree

8 files changed

+554
-6
lines changed

8 files changed

+554
-6
lines changed

.circleci/config.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
command: npm run compile-test
213213
- run:
214214
name: Apt install missing dependencies
215-
command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E88979FB9B30ACF2; sudo apt update && sudo apt install -y libnss3
215+
command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E88979FB9B30ACF2; sudo apt update && sudo apt install -y libnss3 imagemagick
216216
- run:
217217
name: Pip install Basilisp (Python)
218218
command: sudo add-apt-repository --yes ppa:deadsnakes/ppa; sudo apt-get update; sudo apt-get install python3.12; wget https://bootstrap.pypa.io/get-pip.py; sudo python3.12 get-pip.py; sudo python3.12 -m pip install --upgrade pip setuptools wheel; sudo python3.12 -m pip install pipenv; python3.12 -m pip install basilisp==0.1.0b2;
@@ -221,6 +221,9 @@ jobs:
221221
command: npm run integration-test
222222
- store_test_results:
223223
path: ~/calva/junit
224+
- store_artifacts:
225+
path: ~/calva/out/extension-test/integration/screenshots
226+
destination: integration-screenshots
224227
test-e2e:
225228
docker:
226229
- image: cimg/clojure:1.11-browsers

.circleci/jobs/test-integration.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
- Apt install missing dependencies
2121
- sudo apt-key adv --keyserver keyserver.ubuntu.com
2222
--recv-keys E88979FB9B30ACF2;
23-
sudo apt update && sudo apt install -y libnss3
23+
sudo apt update && sudo apt install -y libnss3 imagemagick
2424

2525
- !cmd:
2626
- Pip install Basilisp (Python)
@@ -39,3 +39,7 @@ steps:
3939

4040
- !store:
4141
test_results: ~/calva/junit
42+
43+
- store_artifacts:
44+
path: ~/calva/out/extension-test/integration/screenshots
45+
destination: integration-screenshots

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Changes to Calva.
44

55
## [Unreleased]
66

7+
## [2.0.471] - 2024-09-12
8+
9+
- [Trim leading newlines from the result/error string before inline display](https://github.com/BetterThanTomorrow/calva/issues/2617)
10+
711
## [2.0.470] - 2024-09-11
812

913
- Bump deps.clj to v1.12.0.1479

0 commit comments

Comments
 (0)