Skip to content

Commit f126d4b

Browse files
authored
Merge branch 'processing:main' into gradle-plugin
2 parents da852b4 + fe152b7 commit f126d4b

29 files changed

+470
-201
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pull Requests
1+
name: Pull Requests with Gradle
22
on:
33
pull_request:
44
paths-ignore:
@@ -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
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
name: Releases
2+
on:
3+
release:
4+
types: [published]
5+
6+
jobs:
7+
version:
8+
runs-on: ubuntu-latest
9+
outputs:
10+
build_number: ${{ steps.tag_info.outputs.build_number }}
11+
version: ${{ steps.tag_info.outputs.version }}
12+
steps:
13+
- name: Extract version and build number
14+
id: tag_info
15+
shell: bash
16+
run: |
17+
TAG_NAME="${GITHUB_REF#refs/tags/}"
18+
BUILD_NUMBER=$(echo "$TAG_NAME" | cut -d'-' -f2)
19+
VERSION=$(echo "$TAG_NAME" | cut -d'-' -f3)
20+
21+
# Set outputs for use in later jobs or steps
22+
echo "build_number=$BUILD_NUMBER" >> $GITHUB_OUTPUT
23+
echo "version=$VERSION" >> $GITHUB_OUTPUT
24+
publish:
25+
name: Publish Processing Core to Maven Central
26+
runs-on: ubuntu-latest
27+
needs: version
28+
steps:
29+
- name: Checkout Repository
30+
uses: actions/checkout@v4
31+
- name: Setup Java
32+
uses: actions/setup-java@v4
33+
with:
34+
distribution: 'temurin'
35+
java-version: 17
36+
- name: Setup Gradle
37+
uses: gradle/actions/setup-gradle@v4
38+
- name: Build with Gradle
39+
run: ./gradlew publish
40+
env:
41+
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
42+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
43+
44+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
45+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
46+
47+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
48+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}
49+
50+
ORG_GRADLE_PROJECT_version: ${{ needs.version.outputs.version }}
51+
ORG_GRADLE_PROJECT_group: ${{ vars.PROCESSING_GROUP }}
52+
build:
53+
name: Publish Release for ${{ matrix.os_prefix }} (${{ matrix.arch }})
54+
runs-on: ${{ matrix.os }}
55+
needs: version
56+
permissions:
57+
contents: write
58+
strategy:
59+
fail-fast: false
60+
matrix:
61+
include:
62+
# compiling for arm32 needs a self-hosted runner on Raspi OS (32-bit)
63+
- os: [self-hosted, linux, ARM]
64+
os_prefix: linux
65+
arch: arm
66+
- os: ubuntu-latest
67+
os_prefix: linux
68+
arch: x64
69+
- os: windows-latest
70+
os_prefix: windows
71+
arch: x64
72+
- os: macos-latest
73+
os_prefix: macos
74+
arch: x64
75+
- os: macos-latest
76+
os_prefix: macos
77+
arch: aarch64
78+
- os: macos-latest
79+
os_prefix: linux
80+
arch: aarch64
81+
steps:
82+
- name: Checkout Repository
83+
uses: actions/checkout@v4
84+
- name: Install Java
85+
uses: actions/setup-java@v4
86+
with:
87+
java-version: '17'
88+
distribution: 'temurin'
89+
architecture: ${{ matrix.arch }}
90+
- name: Setup Gradle
91+
uses: gradle/actions/setup-gradle@v4
92+
# - name: Install Certificates for Code Signing
93+
# if: ${{ matrix.os_prefix == 'macos' }}
94+
# uses: apple-actions/import-codesign-certs@v3
95+
# with:
96+
# p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
97+
# p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
98+
- name: Build with Gradle
99+
run: ./gradlew packageDistributionForCurrentOS
100+
env:
101+
ORG_GRADLE_PROJECT_version: ${{ needs.version.outputs.version }}
102+
ORG_GRADLE_PROJECT_group: ${{ vars.PROCESSING_GROUP }}
103+
104+
- name: Upload binaries to release
105+
uses: svenstaro/upload-release-action@v2
106+
with:
107+
repo_token: ${{ secrets.GITHUB_TOKEN }}
108+
file: |
109+
./app/build/compose/binaries/main/dmg/Processing-*.dmg
110+
./app/build/compose/binaries/main/dmg/INSTRUCTIONS_FOR_TESTING.txt
111+
./app/build/compose/binaries/main/msi/Processing-*.msi
112+
./app/build/compose/binaries/main/deb/processing*.deb
113+
file_glob: true

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)