Skip to content

Commit 54e6561

Browse files
committed
Merge branch 'main' into remove-canvas-dependency-from-config
2 parents f438099 + 6e74767 commit 54e6561

File tree

11 files changed

+3519
-4731
lines changed

11 files changed

+3519
-4731
lines changed

.changeset/rich-fans-jump.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"jspsych": patch
3+
"@jspsych/config": patch
4+
---
5+
6+
Patches some edge cases for `getCitations` and the build process that reads CITATION.CFF files to include citation info

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
name: build
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
pull_request:
6+
types: [opened, reopened, ready_for_review, review_requested]
47

58
jobs:
69
test:
710
name: Build, lint, and test on Node.js ${{ matrix.node }}
8-
911
runs-on: ubuntu-latest
1012
strategy:
1113
matrix:

0 commit comments

Comments
 (0)