Skip to content

Commit 8de4575

Browse files
authored
Merge branch 'processing:main' into gradle-cleanup
2 parents 15c42a8 + fe152b7 commit 8de4575

28 files changed

+356
-200
lines changed

.all-contributorsrc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,6 +1428,43 @@
14281428
"contributions": [
14291429
"doc"
14301430
]
1431+
},
1432+
{
1433+
"login": "xinemata",
1434+
"name": "Xin Xin",
1435+
"avatar_url": "https://avatars.githubusercontent.com/u/9159424?v=4",
1436+
"profile": "https://github.com/xinemata",
1437+
"contributions": [
1438+
"eventOrganizing",
1439+
"ideas"
1440+
]
1441+
},
1442+
{
1443+
"login": "tracerstar",
1444+
"name": "Benjamin Fox",
1445+
"avatar_url": "https://avatars.githubusercontent.com/u/234190?v=4",
1446+
"profile": "http://benjaminfoxstudios.com",
1447+
"contributions": [
1448+
"code"
1449+
]
1450+
},
1451+
{
1452+
"login": "e1dem",
1453+
"name": "e1dem",
1454+
"avatar_url": "https://avatars.githubusercontent.com/u/32488297?v=4",
1455+
"profile": "https://github.com/e1dem",
1456+
"contributions": [
1457+
"code"
1458+
]
1459+
},
1460+
{
1461+
"login": "inteqam",
1462+
"name": "Aditya Chaudhary",
1463+
"avatar_url": "https://avatars.githubusercontent.com/u/104833943?v=4",
1464+
"profile": "https://github.com/inteqam",
1465+
"contributions": [
1466+
"code"
1467+
]
14311468
}
14321469
],
14331470
"repoType": "github",

.github/workflows/pull_request-gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- os: [self-hosted, linux, ARM64]
20+
- os: ubuntu-24.04-arm
2121
os_prefix: linux
2222
arch: aarch64
2323
- os: ubuntu-latest

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Build Release
5656
run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ github.sha }}" -Dplatform=${{ matrix.os_prefix }}
5757
- name: Add artifact
58-
uses: actions/upload-artifact@v3
58+
uses: actions/upload-artifact@v4
5959
id: upload
6060
with:
6161
name: processing-pr${{ github.event.pull_request.number }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-ant

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ For a quick start:
3838
1. Fork and clone the repository
3939
1. Open it in IntelliJ IDEA
4040
1. Wait for Gradle to sync
41+
1. Next to the run Button, select the `Processing` Configuration
4142
1. Hit Run
4243

4344
For more information and detailed instructions, follow our [How to Build Processing](BUILD.md) guide.
@@ -281,6 +282,12 @@ Add yourself to the contributors list [here](https://github.com/processing/proce
281282
<td align="center" valign="top" width="16.66%"><a href="http://d.hatena.ne.jp/junology/"><img src="https://avatars.githubusercontent.com/u/1933073?v=4?s=120" width="120px;" alt="Junology"/><br /><sub><b>Junology</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=Junology" title="Code">💻</a></td>
282283
<td align="center" valign="top" width="16.66%"><a href="https://github.com/twisst"><img src="https://avatars.githubusercontent.com/u/2244463?v=4?s=120" width="120px;" alt="Jaap Meijers"/><br /><sub><b>Jaap Meijers</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=twisst" title="Documentation">📖</a></td>
283284
</tr>
285+
<tr>
286+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/xinemata"><img src="https://avatars.githubusercontent.com/u/9159424?v=4?s=120" width="120px;" alt="Xin Xin"/><br /><sub><b>Xin Xin</b></sub></a><br /><a href="#eventOrganizing-xinemata" title="Event Organizing">📋</a> <a href="#ideas-xinemata" title="Ideas, Planning, & Feedback">🤔</a></td>
287+
<td align="center" valign="top" width="16.66%"><a href="http://benjaminfoxstudios.com"><img src="https://avatars.githubusercontent.com/u/234190?v=4?s=120" width="120px;" alt="Benjamin Fox"/><br /><sub><b>Benjamin Fox</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=tracerstar" title="Code">💻</a></td>
288+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/e1dem"><img src="https://avatars.githubusercontent.com/u/32488297?v=4?s=120" width="120px;" alt="e1dem"/><br /><sub><b>e1dem</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=e1dem" title="Code">💻</a></td>
289+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/inteqam"><img src="https://avatars.githubusercontent.com/u/104833943?v=4?s=120" width="120px;" alt="Aditya Chaudhary"/><br /><sub><b>Aditya Chaudhary</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=inteqam" title="Code">💻</a></td>
290+
</tr>
284291
</tbody>
285292
</table>
286293

0 commit comments

Comments
 (0)