Skip to content

Commit 4972ae4

Browse files
committed
Merge branch 'main' into Adding-Trigonometry-Example
2 parents 2188950 + 46d3118 commit 4972ae4

File tree

550 files changed

+85740
-39484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

550 files changed

+85740
-39484
lines changed

.gitattributes

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Set default behaviour to automatically normalize line endings.
2+
* text=auto
3+
4+
# prevents git from converting LF to CRLF, which causes issues
5+
# when assembling example pages on Windows
6+
src/data/examples/**/*.js eol=lf
7+
8+
# Denote all files that are truly binary and should not be modified.
9+
*.ai binary
10+
*.gif binary
11+
*.ico binary
12+
*.jpg binary
13+
*.mov binary
14+
*.mp3 binary
15+
*.mp4 binary
16+
*.ogg binary
17+
*.ogv binary
18+
*.otf binary
19+
*.pdf binary
20+
*.png binary
21+
*.ttf binary
22+
*.wav binary
23+
*.webm binary
24+
*.zip binary

.github/ISSUE_TEMPLATE/discussion.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: 💭 Discussion
2+
description: This template is for starting a discussion.
3+
labels: [ Discussion ]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Topic
8+
description: What do you want to discuss with the group?
9+
validations:
10+
required: true

.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: 🌱 New Feature Request
22
description: Request a new feature be added.
3-
labels: [feature request]
3+
labels: [ Feature Request ]
44
body:
55
- type: textarea
66
attributes:
@@ -27,7 +27,7 @@ body:
2727
- Showcase
2828
- Other (specify if possible)
2929
validations:
30-
required: true
30+
required: true
3131

3232
- type: textarea
3333
attributes:

.github/ISSUE_TEMPLATE/found-a-bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "🐛 Found a Bug"
22
description: Report p5.js website bugs (broken or incorrect behaviour).
3-
labels: [ bug ]
3+
labels: [ Bug ]
44
body:
55
- type: markdown
66
attributes:

.github/ISSUE_TEMPLATE/improve-translation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "🌐 Improve Translation"
22
description: Make a suggestion or report a problem about the translation of p5.js website.
3-
labels: [ translation ]
3+
labels: [ Translation ]
44
body:
55
- type: markdown
66
attributes:

.github/workflows/deploy.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Use Node.js
1313
uses: actions/setup-node@v1
1414
with:
15-
node-version: "14.x"
15+
node-version: "18.x"
1616
- name: Install node modules
1717
run: npm ci
1818
- name: Build
@@ -23,3 +23,5 @@ jobs:
2323
branch: gh-pages # The branch the action should deploy to.
2424
folder: dist/ # The folder the action should deploy.
2525
single-commit: false # "false" here means "preserve git history on the gh-pages branch"
26+
- name: Update Download page
27+
run: curl https://p5js.org/download/release.php

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Use Node.js
1616
uses: actions/setup-node@v1
1717
with:
18-
node-version: "14.x"
18+
node-version: "18.x"
1919
- name: Install node modules
2020
run: npm ci
2121
- name: Run tests

.github/workflows/update-documentation.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010

1111
jobs:
1212
build:
13-
name: Update p5.js documentation
13+
name: Update p5.js documentation and library files
1414
runs-on: ubuntu-latest
1515

1616
steps:
@@ -19,29 +19,19 @@ jobs:
1919
- name: Install Node.JS 12.x
2020
uses: actions/setup-node@v1
2121
with:
22-
node-version: 12.x
23-
- name: Extract documentation from the p5.js repo
22+
node-version: 18.x
23+
- name: Extract documentation and library files from the p5.js repo
2424
run: |
2525
npm install
26-
npm run grunt update-enJSON
26+
npm run grunt update-enJSON --target="${{ steps.p5js.outputs.VERSION }}"
2727
- name: Get p5.js release info
2828
id: p5js
2929
run: |
3030
echo ::set-output name=VERSION::${P5JS_REF/refs\/tags\//}
3131
echo ::set-output name=SHA::${P5JS_SHA}
32-
- name: Get latest p5.min.js build
33-
uses: suisei-cn/actions-download-file@v1
34-
with:
35-
url: https://github.com/processing/p5.js/releases/download/${{github.event.client_payload.ref}}/p5.min.js
36-
target: src/assets/js/
37-
- name: Get latest p5.sound.min.js build
38-
uses: suisei-cn/actions-download-file@v1
39-
with:
40-
url: https://github.com/processing/p5.js/releases/download/${{github.event.client_payload.ref}}/p5.sound.min.js
41-
target: src/assets/js/
4232
- name: Commit changes
4333
uses: EndBug/add-and-commit@v4
4434
with:
45-
message: 'Update Reference files for p5.js ${{ steps.p5js.outputs.VERSION }} release (${{ steps.p5js.outputs.SHA }})'
35+
message: 'Update files for p5.js ${{ steps.p5js.outputs.VERSION }} release (${{ steps.p5js.outputs.SHA }})'
4636
env:
4737
GITHUB_TOKEN: ${{ secrets.DOCS_COMMIT_TOKEN }}

.github/workflows/update-translation-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Node.JS 12.x
1818
uses: actions/setup-node@v1
1919
with:
20-
node-version: 12.x
20+
node-version: 18.x
2121
- name: npm install
2222
run: npm install
2323
# - name: Update json files

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ src/offline-reference
3030
!src/templates/pages/examples/.gitkeep
3131
dist/*
3232
!dist/git-pull.php
33-
!dist/download/release.php
33+
!dist/download/version.json
3434
!dist/books/media.zip
3535
!dist/learn/books/media.zip

0 commit comments

Comments
 (0)