Skip to content

Commit

Permalink
Pez/vsix+fs testing flakyness (#156)
Browse files Browse the repository at this point in the history
* Make runner reject on errors

* Make launcher take args to test a VSIX

* Add VSIX + FS integration tests to CI

* Fixes #154

* Bump vsce and test-electron

* Update changelog about #154

* Fix bug with requiring old test-integration job

* Remove dist copy

* DRY up testing of nss a bit

(We should probably either figure out why we need to do this, or
glob the list from the filesystem ourselves. TODO.)

* Create and include dummy VSIX

* Install a dummy VSIX when running FS tests

* Clarify dummy extension directory purpose

* Add link to vscode-test issue

* microsoft/vscode-test#192
  • Loading branch information
PEZ authored Feb 13, 2023
1 parent da737a3 commit 259e0f0
Show file tree
Hide file tree
Showing 17 changed files with 680 additions and 177 deletions.
46 changes: 42 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
- artifacts
- build
- env
test-integration:
test-integration-fs:
docker:
- image: cimg/clojure:1.11-browsers
working_directory: ~/joyride
Expand All @@ -145,6 +145,32 @@ jobs:
- .vscode-test/extensions
- .vscode-test/vscode-linux-x64-insiders
- ./vscode-test-runner/workspace-1/node_modules
test-integration-vsix:
docker:
- image: cimg/clojure:1.11-browsers
working_directory: ~/joyride
steps:
- attach_workspace:
at: /tmp
- run:
name: Restore build
command: rmdir ~/joyride && cp -r /tmp/build ~/joyride
- restore_cache:
name: Restore dependencies (VS Code install, Joyride workspace node_modules)
key: npm-{{ checksum "./vscode-test-runner/workspace-1/package.json" }}
- run:
name: Apt install missing dependencies
command: sudo apt update && sudo apt install -y libnss3
- run:
name: Run Extension Tests
command: npm run integration-test -- --joyride-vsix=/tmp/artifacts/joyride-$(node -p 'require("./package.json").version').vsix
- save_cache:
name: Save dependencies (VS Code install, Joyride workspace node_modules)
key: npm-{{ checksum "./vscode-test-runner/workspace-1/package.json" }}
paths:
- .vscode-test/extensions
- .vscode-test/vscode-linux-x64-insiders
- ./vscode-test-runner/workspace-1/node_modules
github-release:
docker:
- image: cibuilds/github:0.10
Expand Down Expand Up @@ -269,7 +295,10 @@ workflows:
#- test-cljslib:
# requires:
# - build
- test-integration:
- test-integration-fs:
requires:
- build
- test-integration-vsix:
requires:
- build
release-publish:
Expand All @@ -296,7 +325,15 @@ workflows:
# ignore: /.*/
# tags:
# only: /^v\d+\.\d+\.\d+-?.*/
- test-integration:
- test-integration-fs:
requires:
- build
filters:
branches:
ignore: /.*/
tags:
only: /^v\d+\.\d+\.\d+-?.*/
- test-integration-vsix:
requires:
- build
filters:
Expand All @@ -306,7 +343,8 @@ workflows:
only: /^v\d+\.\d+\.\d+-?.*/
- github-release:
requires:
- test-integration
- test-integration-fs
- test-integration-vsix
filters:
branches:
ignore: /.*/
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changes to Joyride
## [0.0.33] - 2023-02-12

- [Add rewrite-clj as built-in CLJS library](https://github.com/BetterThanTomorrow/joyride/issues/150)
- Joyride dev: [Test the VSIX package in addition to from the filesystem](https://github.com/BetterThanTomorrow/joyride/issues/154)

## [0.0.32] - 2023-01-16

Expand Down
Loading

0 comments on commit 259e0f0

Please sign in to comment.