Skip to content

Commit 4a77779

Browse files
authored
Merge branch 'main' into shader-hooks
2 parents 69fdeb9 + a5ef7a7 commit 4a77779

Some content is hidden

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

64 files changed

+10216
-3001
lines changed

.all-contributorsrc

Lines changed: 202 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3637,7 +3637,8 @@
36373637
"avatar_url": "https://avatars.githubusercontent.com/u/958471?v=4",
36383638
"profile": "https://shibomb.xyz",
36393639
"contributions": [
3640-
"code"
3640+
"code",
3641+
"translation"
36413642
]
36423643
},
36433644
{
@@ -5645,7 +5646,8 @@
56455646
"avatar_url": "https://avatars.githubusercontent.com/u/104259212?v=4",
56465647
"profile": "https://github.com/haroon10725",
56475648
"contributions": [
5648-
"doc"
5649+
"doc",
5650+
"code"
56495651
]
56505652
},
56515653
{
@@ -5917,6 +5919,204 @@
59175919
"code",
59185920
"test"
59195921
]
5922+
},
5923+
{
5924+
"login": "bobbykaz",
5925+
"name": "Bobby Kazimiroff",
5926+
"avatar_url": "https://avatars.githubusercontent.com/u/1424679?v=4",
5927+
"profile": "http://bobbykaz.com",
5928+
"contributions": [
5929+
"doc"
5930+
]
5931+
},
5932+
{
5933+
"login": "PalumboN",
5934+
"name": "Nahuel Palumbo",
5935+
"avatar_url": "https://avatars.githubusercontent.com/u/4098184?v=4",
5936+
"profile": "https://github.com/PalumboN",
5937+
"contributions": [
5938+
"bug",
5939+
"doc"
5940+
]
5941+
},
5942+
{
5943+
"login": "lottihill",
5944+
"name": "lottihill",
5945+
"avatar_url": "https://avatars.githubusercontent.com/u/76125564?v=4",
5946+
"profile": "https://github.com/lottihill",
5947+
"contributions": [
5948+
"doc",
5949+
"bug"
5950+
]
5951+
},
5952+
{
5953+
"login": "JulioGitLab",
5954+
"name": "Julio Lab",
5955+
"avatar_url": "https://avatars.githubusercontent.com/u/156870555?v=4",
5956+
"profile": "https://github.com/JulioGitLab",
5957+
"contributions": [
5958+
"doc"
5959+
]
5960+
},
5961+
{
5962+
"login": "JordanSucher",
5963+
"name": "Jordan Sucher",
5964+
"avatar_url": "https://avatars.githubusercontent.com/u/9809109?v=4",
5965+
"profile": "https://github.com/JordanSucher",
5966+
"contributions": [
5967+
"bug",
5968+
"code"
5969+
]
5970+
},
5971+
{
5972+
"login": "iambiancafonseca",
5973+
"name": "iambiancafonseca",
5974+
"avatar_url": "https://avatars.githubusercontent.com/u/102000079?v=4",
5975+
"profile": "https://github.com/iambiancafonseca",
5976+
"contributions": [
5977+
"doc"
5978+
]
5979+
},
5980+
{
5981+
"login": "Vishal2002",
5982+
"name": "Vishal Sharma",
5983+
"avatar_url": "https://avatars.githubusercontent.com/u/35897449?v=4",
5984+
"profile": "https://github.com/Vishal2002",
5985+
"contributions": [
5986+
"code"
5987+
]
5988+
},
5989+
{
5990+
"login": "PiyushChandra17",
5991+
"name": "PiyushChandra17",
5992+
"avatar_url": "https://avatars.githubusercontent.com/u/47579287?v=4",
5993+
"profile": "https://piyushs-folio-c8b8.onrender.com/",
5994+
"contributions": [
5995+
"code",
5996+
"bug",
5997+
"review"
5998+
]
5999+
},
6000+
{
6001+
"login": "dgrantham01",
6002+
"name": "Daniel Grantham",
6003+
"avatar_url": "https://avatars.githubusercontent.com/u/71230430?v=4",
6004+
"profile": "https://github.com/dgrantham01",
6005+
"contributions": [
6006+
"code"
6007+
]
6008+
},
6009+
{
6010+
"login": "m0nica",
6011+
"name": "Monica Powell",
6012+
"avatar_url": "https://avatars.githubusercontent.com/u/6998954?v=4",
6013+
"profile": "https://aboutmonica.com",
6014+
"contributions": [
6015+
"talk",
6016+
"example"
6017+
]
6018+
},
6019+
{
6020+
"login": "rohanjulka19",
6021+
"name": "Rohan Julka",
6022+
"avatar_url": "https://avatars.githubusercontent.com/u/19673968?v=4",
6023+
"profile": "https://github.com/rohanjulka19",
6024+
"contributions": [
6025+
"code"
6026+
]
6027+
},
6028+
{
6029+
"login": "ravixalgorithm",
6030+
"name": "Mr. Algorithm",
6031+
"avatar_url": "https://avatars.githubusercontent.com/u/148683640?v=4",
6032+
"profile": "https://github.com/ravixalgorithm",
6033+
"contributions": [
6034+
"doc"
6035+
]
6036+
},
6037+
{
6038+
"login": "sambensim",
6039+
"name": "sambensim",
6040+
"avatar_url": "https://avatars.githubusercontent.com/u/28797947?v=4",
6041+
"profile": "https://github.com/sambensim",
6042+
"contributions": [
6043+
"doc"
6044+
]
6045+
},
6046+
{
6047+
"login": "NicholasGillen",
6048+
"name": "NicholasGillen",
6049+
"avatar_url": "https://avatars.githubusercontent.com/u/80383027?v=4",
6050+
"profile": "https://github.com/NicholasGillen",
6051+
"contributions": [
6052+
"doc"
6053+
]
6054+
},
6055+
{
6056+
"login": "Abhinavcode13",
6057+
"name": "Abhinav kumar",
6058+
"avatar_url": "https://avatars.githubusercontent.com/u/126642111?v=4",
6059+
"profile": "http://abhinavcode13.github.io",
6060+
"contributions": [
6061+
"doc"
6062+
]
6063+
},
6064+
{
6065+
"login": "chhaski",
6066+
"name": "chaski",
6067+
"avatar_url": "https://avatars.githubusercontent.com/u/71788879?v=4",
6068+
"profile": "https://github.com/chhaski",
6069+
"contributions": [
6070+
"research",
6071+
"code",
6072+
"example"
6073+
]
6074+
},
6075+
{
6076+
"login": "Evorage0",
6077+
"name": "Evorage",
6078+
"avatar_url": "https://avatars.githubusercontent.com/u/68397475?v=4",
6079+
"profile": "https://github.com/Evorage0",
6080+
"contributions": [
6081+
"bug",
6082+
"code"
6083+
]
6084+
},
6085+
{
6086+
"login": "starzonmyarmz",
6087+
"name": "Daniel Marino",
6088+
"avatar_url": "https://avatars.githubusercontent.com/u/171375?v=4",
6089+
"profile": "http://iamdanielmarino.com",
6090+
"contributions": [
6091+
"doc"
6092+
]
6093+
},
6094+
{
6095+
"login": "Shahmaz0",
6096+
"name": "Shahma Ansari",
6097+
"avatar_url": "https://avatars.githubusercontent.com/Shahmaz0",
6098+
"profile": "https://github.com/shahmaz0/",
6099+
"contributions": [
6100+
"bug"
6101+
]
6102+
},
6103+
{
6104+
"login": "Manancode",
6105+
"name": "Manan Arora",
6106+
"avatar_url": "https://avatars.githubusercontent.com/u/144525586?v=4",
6107+
"profile": "https://github.com/Manancode",
6108+
"contributions": [
6109+
"doc"
6110+
]
6111+
},
6112+
{
6113+
"login": "Serena20003",
6114+
"name": "Serena20003",
6115+
"avatar_url": "https://avatars.githubusercontent.com/u/54823659?v=4",
6116+
"profile": "https://github.com/Serena20003",
6117+
"contributions": [
6118+
"code"
6119+
]
59206120
}
59216121
],
59226122
"repoType": "github",

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ blank_issues_enabled: false
22
contact_links:
33
- name: 🎧 p5.sound Issues
44
url: https://github.com/processing/p5.js-sound/issues
5-
about: Report issues with p5.sound here.
5+
about: Report issues with p5.sound here. Note, p5.sound is being updated at this moment.
66
- name: 🌐 Website Issues
77
url: https://github.com/processing/p5.js-website/issues
88
about: Report issues with the p5.js website here.

.github/workflows/release.yml renamed to .github/workflows/release-workflow.yml

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -73,43 +73,26 @@ jobs:
7373
uses: JS-DevTools/npm-publish@v1
7474
with:
7575
token: ${{ secrets.NPM_TOKEN }}
76-
77-
# 4. Update website files
78-
- name: Checkout website repo
76+
77+
# 4. Update p5.js website
78+
- name: Clone p5.js website
7979
if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
8080
uses: actions/checkout@v3
8181
with:
8282
repository: processing/p5.js-website
8383
path: website
8484
fetch-depth: 0
8585
token: ${{ secrets.ACCESS_TOKEN }}
86-
- name: Copy reference files to website repo
87-
if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
88-
run: cp docs/reference/data.* website/src/templates/pages/reference/
89-
- name: Copy library files to website repo
90-
if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
91-
run: cp lib/p5.min.js lib/addons/p5.sound.min.js website/src/assets/js/
92-
- name: Modify version number on website
93-
if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
94-
uses: fjogeleit/[email protected]
95-
with:
96-
valueFile: website/src/data/data.yml
97-
propertyPath: version
98-
value: ${{ steps.version-number.outputs.version }}
99-
commitChange: false
100-
updateFile: true
101-
- name: Update version.json on website repo
102-
if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
103-
uses: restackio/[email protected]
104-
with:
105-
file: website/dist/download/version.json
106-
fields: '{"version": "${{ steps.version-number.outputs.version }}", "date": "${{ steps.date.outputs.date }}"}'
107-
- name: Update en.json on website repo
86+
- name: Updated website files
10887
if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
10988
run: |
11089
cd website
111-
npm ci
112-
npx grunt generate_enJSON
90+
npm install
91+
npm run build:contributor-docs
92+
npm run build:contributors
93+
npm run build:reference
94+
npm run build:search
95+
npm run build:p5-version
11396
- name: Commit updated website files
11497
if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
11598
run: |
@@ -125,7 +108,7 @@ jobs:
125108
github_token: ${{ secrets.ACCESS_TOKEN }}
126109
branch: main
127110
directory: website/
128-
repository: processing/p5.js-website
111+
repository: processing/p5.js-website
129112

130113
# 5. Update Bower files
131114
- name: Checkout Bower repo

0 commit comments

Comments
 (0)