Skip to content

Commit

Permalink
Merge branch 'main' into remove-canvas-dependency-from-config
Browse files Browse the repository at this point in the history
  • Loading branch information
jodeleeuw committed Jan 28, 2025
2 parents f438099 + 6e74767 commit 54e6561
Show file tree
Hide file tree
Showing 11 changed files with 3,519 additions and 4,731 deletions.
6 changes: 6 additions & 0 deletions .changeset/rich-fans-jump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"jspsych": patch
"@jspsych/config": patch
---

Patches some edge cases for `getCitations` and the build process that reads CITATION.CFF files to include citation info
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
name: build

on: [push, pull_request]
on:
push:
pull_request:
types: [opened, reopened, ready_for_review, review_requested]

jobs:
test:
name: Build, lint, and test on Node.js ${{ matrix.node }}

runs-on: ubuntu-latest
strategy:
matrix:
Expand Down
Loading

0 comments on commit 54e6561

Please sign in to comment.