Skip to content

Commit

Permalink
Merge branch dev into published
Browse files Browse the repository at this point in the history
  • Loading branch information
PEZ committed Sep 12, 2024
2 parents 9532e82 + 5ba70fd commit 2e9ed8a
Show file tree
Hide file tree
Showing 8 changed files with 554 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ jobs:
command: npm run compile-test
- run:
name: Apt install missing dependencies
command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E88979FB9B30ACF2; sudo apt update && sudo apt install -y libnss3
command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E88979FB9B30ACF2; sudo apt update && sudo apt install -y libnss3 imagemagick
- run:
name: Pip install Basilisp (Python)
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;
Expand All @@ -221,6 +221,9 @@ jobs:
command: npm run integration-test
- store_test_results:
path: ~/calva/junit
- store_artifacts:
path: ~/calva/out/extension-test/integration/screenshots
destination: integration-screenshots
test-e2e:
docker:
- image: cimg/clojure:1.11-browsers
Expand Down
6 changes: 5 additions & 1 deletion .circleci/jobs/test-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ steps:
- Apt install missing dependencies
- sudo apt-key adv --keyserver keyserver.ubuntu.com
--recv-keys E88979FB9B30ACF2;
sudo apt update && sudo apt install -y libnss3
sudo apt update && sudo apt install -y libnss3 imagemagick

- !cmd:
- Pip install Basilisp (Python)
Expand All @@ -39,3 +39,7 @@ steps:

- !store:
test_results: ~/calva/junit

- store_artifacts:
path: ~/calva/out/extension-test/integration/screenshots
destination: integration-screenshots
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Changes to Calva.

## [Unreleased]

## [2.0.471] - 2024-09-12

- [Trim leading newlines from the result/error string before inline display](https://github.com/BetterThanTomorrow/calva/issues/2617)

## [2.0.470] - 2024-09-11

- Bump deps.clj to v1.12.0.1479
Expand Down
Loading

0 comments on commit 2e9ed8a

Please sign in to comment.