-
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into touchstarted-fix
- Loading branch information
Showing
31 changed files
with
660 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| name: 📃 p5.js 2.0 RFC Proposal | ||
| description: This template is for submitting a proposal to the p5.js 2.0 RFC. | ||
| title: "[p5.js 2.0 RFC Proposal]: " | ||
| labels: [p5.js 2.0] | ||
| body: | ||
| - type: textarea | ||
| attributes: | ||
| label: Increasing access | ||
| description: How would this proposal help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to p5.js? (If you're not sure, you can type "Unsure" here and let others from the community offer their thoughts.) | ||
| validations: | ||
| required: true | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| ### Acceptance criteria | ||
| The [p5.js 2.0 RFC](https://github.com/processing/p5.js/blob/dev-2.0/rfc_p5js_2.md) is a compilation of proposals for the next major version of p5.js. | ||
| **✖️ New features**: In order to focus the community's efforts, proposals for new features will typically not be accepted into the RFC. A [New Feature Request](https://github.com/processing/p5.js/issues/new?assignees=&labels=Feature+Request&projects=&template=feature-request.yml) may still be submitted, but it will only be considered after the release of p5.js 2.0. | ||
| **✔️Existing features**: This proposal will be accepted if the community determines it would improve an existing feature through a breaking change, a systemic change, or an overdue change. | ||
| - type: checkboxes | ||
| id: type-of-change | ||
| attributes: | ||
| label: Which types of changes would be made? | ||
| description: Please select at least one. | ||
| options: | ||
| - label: Breaking change (Add-on libraries or sketches will work differently even if their code stays the same.) | ||
| - label: Systemic change (Many features or contributor workflows will be affected.) | ||
| - label: Overdue change (Modifications will be made that have been desirable for a long time.) | ||
| - label: Unsure (The community can help to determine the type of change.) | ||
| - type: checkboxes | ||
| id: sub-area | ||
| attributes: | ||
| label: Most appropriate sub-area of p5.js? | ||
| description: Please select at least one. | ||
| options: | ||
| - label: Accessibility | ||
| - label: Color | ||
| - label: Core/Environment/Rendering | ||
| - label: Data | ||
| - label: DOM | ||
| - label: Events | ||
| - label: Image | ||
| - label: IO | ||
| - label: Math | ||
| - label: Typography | ||
| - label: Utilities | ||
| - label: WebGL | ||
| - label: Build process | ||
| - label: Unit testing | ||
| - label: Internationalization | ||
| - label: Friendly errors | ||
| - label: Other (specify if possible) | ||
| - type: textarea | ||
| attributes: | ||
| label: What's the problem? | ||
| description: Describe the problem this proposal aims to solve. (Use as much space as you need.) | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: What's the solution? | ||
| description: Describe how you would solve the problem. (For large proposals, a summary is fine; this proposal can link to sub-issues for details.) | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Pros (updated based on community comments) | ||
| description: Indicate the advantages of implementing this proposal. If the community identifies more advantages in the comments, please add them. | ||
| value: | | ||
| Example list: | ||
| * **Consistency:** This proposal increases API consistency by... | ||
| * **Readability:** This proposal makes the source code more readable by... | ||
| * Other advantages... | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Cons (updated based on community comments) | ||
| description: Indicate the disadvantages of implementing this proposal, if you know of any. If the community identifies disadvantages in the comments, please add them. | ||
| placeholder: None so far... | ||
| validations: | ||
| required: true | ||
| - type: dropdown | ||
| attributes: | ||
| label: Proposal status | ||
| options: | ||
| - Under review | ||
| - Accepted | ||
| - Not accepted | ||
| default: 0 | ||
| validations: | ||
| required: true | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| ### Implementation process | ||
| If this proposal is accepted, it will be included in the p5.js 2.0 RFC. A contributor who has participated in the discussion will then be assigned to lead the implementation, which will happen on the [dev-2.0](https://github.com/processing/p5.js/tree/dev-2.0) branch. |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ on: | |
| push: | ||
| tags: | ||
| - 'v*.*.*' # Push events to matching v*.*.*, i.e. v20.15.10 | ||
| - 'v*.*.*-*' # Push events to matching v*.*.*-*, i.e. v20.15.10-0 | ||
|
|
||
| jobs: | ||
| release: | ||
|
|
@@ -21,11 +22,18 @@ jobs: | |
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 18 | ||
| - name: Get semver info | ||
| id: semver | ||
| uses: akshens/semver-tag@v4 | ||
| with: | ||
| version: ${{ github.ref_name }} | ||
|
|
||
| - name: Get version number | ||
| id: version-number | ||
| run: | | ||
| version=$(echo ${{ github.ref_name }} | cut -c 2-) | ||
| echo "version=$version" >> $GITHUB_OUTPUT | ||
| - name: Get current date | ||
| id: date | ||
| run: echo "date=$(date +"%B %Oe, %Y")" >> $GITHUB_OUTPUT | ||
|
|
@@ -56,27 +64,33 @@ jobs: | |
| uses: softprops/[email protected] | ||
| with: | ||
| draft: true | ||
| prerelease: ${{ steps.semver.outputs.is-prerelease == 'true' }} | ||
| files: release/* | ||
| generate_release_notes: true | ||
| token: ${{ secrets.ACCESS_TOKEN }} | ||
| - name: Publish to NPM | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| uses: JS-DevTools/npm-publish@v1 | ||
| with: | ||
| token: ${{ secrets.NPM_TOKEN }} | ||
|
|
||
| # 4. Update website files | ||
| - name: Checkout website repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: processing/p5.js-website | ||
| path: website | ||
| fetch-depth: 0 | ||
| token: ${{ secrets.ACCESS_TOKEN }} | ||
| - name: Copy reference files to website repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| run: cp docs/reference/data.* website/src/templates/pages/reference/ | ||
| - name: Copy library files to website repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| run: cp lib/p5.min.js lib/addons/p5.sound.min.js website/src/assets/js/ | ||
| - name: Modify version number on website | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| uses: fjogeleit/[email protected] | ||
| with: | ||
| valueFile: website/src/data/data.yml | ||
|
|
@@ -85,23 +99,27 @@ jobs: | |
| commitChange: false | ||
| updateFile: true | ||
| - name: Update version.json on website repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| uses: restackio/[email protected] | ||
| with: | ||
| file: website/dist/download/version.json | ||
| fields: '{"version": "${{ steps.version-number.outputs.version }}", "date": "${{ steps.date.outputs.date }}"}' | ||
| - name: Update en.json on website repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| run: | | ||
| cd website | ||
| npm ci | ||
| npx grunt generate_enJSON | ||
| - name: Commit updated website files | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| run: | | ||
| cd website | ||
| git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
| git config --local user.name "github-actions[bot]" | ||
| git add . | ||
| git commit -m "Update p5.js to ${{ github.ref_name }}" | ||
| - name: Push updated website repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| uses: ad-m/[email protected] | ||
| with: | ||
| github_token: ${{ secrets.ACCESS_TOKEN }} | ||
|
|
@@ -111,24 +129,28 @@ jobs: | |
|
|
||
| # 5. Update Bower files | ||
| - name: Checkout Bower repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: processing/p5.js-release | ||
| path: bower | ||
| fetch-depth: 0 | ||
| token: ${{ secrets.ACCESS_TOKEN }} | ||
| - name: Copy new version files to Bower repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| run: | | ||
| cp lib/*.js bower/lib/ | ||
| cp lib/addons/* bower/lib/addons/ | ||
| - name: Commit updated Bower files | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| run: | | ||
| cd bower | ||
| git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
| git config --local user.name "github-actions[bot]" | ||
| git add . | ||
| git commit -m "Update p5.js to ${{ github.ref_name }}" | ||
| - name: Push updated Bower repo | ||
| if: ${{ steps.semver.outputs.is-prerelease != 'true' }} | ||
| uses: ad-m/[email protected] | ||
| with: | ||
| github_token: ${{ secrets.ACCESS_TOKEN }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.