Skip to content

Commit 7e6c97a

Browse files
SteftervStefterv
committed
Merge branch 'main' into gradle-plugin
2 parents f126d4b + 8e8f7dc commit 7e6c97a

Some content is hidden

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

52 files changed

+2841
-258
lines changed

‎.github/workflows/build-gradle.yml

+36-15
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,63 @@
1-
name: Pre-releases with Gradle
1+
name: Branch Builds
22
on:
33
push:
44
paths-ignore:
55
- '**/*.md'
66
- '.all-contributorsrc'
77

88
jobs:
9+
test:
10+
runs-on: ubuntu-latest
11+
name: Test Processing
12+
steps:
13+
- name: Checkout Repository
14+
uses: actions/checkout@v4
15+
- name: Install Java
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
- name: Setup Gradle
21+
uses: gradle/actions/setup-gradle@v4
22+
23+
- name: Build with Gradle
24+
run: ./gradlew test
925
build:
10-
name: Create Pre-release for ${{ matrix.os_prefix }} (${{ matrix.arch }})
26+
name: (${{ matrix.os_prefix }}/${{ matrix.arch }}) Create Processing Build
1127
runs-on: ${{ matrix.os }}
12-
permissions:
13-
contents: write
28+
needs: test
1429
strategy:
1530
fail-fast: false
1631
matrix:
1732
include:
18-
- os: [self-hosted, linux, ARM64]
33+
- os: ubuntu-24.04-arm
1934
os_prefix: linux
2035
arch: aarch64
36+
binary: processing*.snap
2137
- os: ubuntu-latest
2238
os_prefix: linux
2339
arch: x64
40+
binary: processing*.snap
2441
- os: windows-latest
2542
os_prefix: windows
2643
arch: x64
44+
binary: msi/Processing-*.msi
2745
- os: macos-latest
2846
os_prefix: macos
2947
arch: x64
48+
binary: dmg/Processing-*.dmg
3049
- os: macos-latest
3150
os_prefix: macos
3251
arch: aarch64
52+
binary: dmg/Processing-*.dmg
3353
steps:
54+
- name: Install Snapcraft
55+
if: runner.os == 'Linux'
56+
uses: samuelmeuli/action-snapcraft@v3
57+
- name: Install LXD
58+
if: runner.os == 'Linux'
59+
uses: canonical/setup-lxd@main
60+
3461
- name: Checkout Repository
3562
uses: actions/checkout@v4
3663
- name: Install Java
@@ -41,19 +68,13 @@ jobs:
4168
architecture: ${{ matrix.arch }}
4269
- name: Setup Gradle
4370
uses: gradle/actions/setup-gradle@v4
71+
4472
- name: Build with Gradle
4573
run: ./gradlew packageDistributionForCurrentOS
46-
- name: Add instructions
47-
if: ${{ matrix.os_prefix == 'macos' }}
48-
run: |
49-
echo "run 'xattr -d com.apple.quarantine Processing-${version}.dmg' to remove the quarantine flag" > ./app/build/compose/binaries/main/dmg/INSTRUCTIONS_FOR_TESTING.txt
74+
5075
- name: Add artifact
5176
uses: actions/upload-artifact@v4
5277
with:
53-
name: processing-${{ github.ref_name }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-gradle
54-
path: |
55-
./app/build/compose/binaries/main/dmg/Processing-*.dmg
56-
./app/build/compose/binaries/main/dmg/INSTRUCTIONS_FOR_TESTING.txt
57-
./app/build/compose/binaries/main/msi/Processing-*.msi
58-
./app/build/compose/binaries/main/deb/processing*.deb
78+
name: processing-${{ matrix.os_prefix }}-${{ matrix.arch }}-br_${{ github.ref_name }}
5979
retention-days: 1
80+
path: app/build/compose/binaries/main/${{ matrix.binary }}

‎.github/workflows/maven.yml

-37
This file was deleted.

‎.github/workflows/pull_request-gradle.yml

+35-15
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,58 @@ on:
77
- main
88

99
jobs:
10-
build:
11-
name: Create Pull Request Build for ${{ matrix.os_prefix }} (${{ matrix.arch }})
10+
test:
11+
runs-on: ubuntu-latest
12+
name: Test Processing
13+
steps:
14+
- name: Checkout Repository
15+
uses: actions/checkout@v4
16+
- name: Install Java
17+
uses: actions/setup-java@v4
18+
with:
19+
java-version: '17'
20+
distribution: 'temurin'
21+
- name: Setup Gradle
22+
uses: gradle/actions/setup-gradle@v4
23+
24+
- name: Build with Gradle
25+
run: ./gradlew test
26+
build:
27+
name: (${{ matrix.os_prefix }}/${{ matrix.arch }}) Create Processing Build
1228
runs-on: ${{ matrix.os }}
13-
permissions:
14-
pull-requests: write
15-
contents: read
29+
needs: test
1630
strategy:
1731
fail-fast: false
1832
matrix:
1933
include:
2034
- os: ubuntu-24.04-arm
2135
os_prefix: linux
2236
arch: aarch64
37+
binary: processing*.snap
2338
- os: ubuntu-latest
2439
os_prefix: linux
2540
arch: x64
41+
binary: processing*.snap
2642
- os: windows-latest
2743
os_prefix: windows
2844
arch: x64
45+
binary: msi/Processing-*.msi
2946
- os: macos-latest
3047
os_prefix: macos
3148
arch: x64
49+
binary: dmg/Processing-*.dmg
3250
- os: macos-latest
3351
os_prefix: macos
3452
arch: aarch64
53+
binary: dmg/Processing-*.dmg
3554
steps:
55+
- name: Install Snapcraft
56+
if: runner.os == 'Linux'
57+
uses: samuelmeuli/action-snapcraft@v3
58+
- name: Install LXD
59+
if: runner.os == 'Linux'
60+
uses: canonical/setup-lxd@main
61+
3662
- name: Checkout Repository
3763
uses: actions/checkout@v4
3864
- name: Install Java
@@ -43,19 +69,13 @@ jobs:
4369
architecture: ${{ matrix.arch }}
4470
- name: Setup Gradle
4571
uses: gradle/actions/setup-gradle@v4
72+
4673
- name: Build with Gradle
4774
run: ./gradlew packageDistributionForCurrentOS
48-
- name: Add instructions
49-
if: ${{ matrix.os_prefix == 'macos' }}
50-
run: |
51-
echo "run 'xattr -d com.apple.quarantine Processing-${version}.dmg' to remove the quarantine flag" > ./app/build/compose/binaries/main/dmg/INSTRUCTIONS_FOR_TESTING.txt
75+
5276
- name: Add artifact
5377
uses: actions/upload-artifact@v4
5478
with:
55-
name: processing-pr${{ github.event.pull_request.number }}-${{github.sha}}-${{ matrix.os_prefix }}-${{ matrix.arch }}-gradle
56-
path: |
57-
./app/build/compose/binaries/main/dmg/Processing-*.dmg
58-
./app/build/compose/binaries/main/dmg/INSTRUCTIONS_FOR_TESTING.txt
59-
./app/build/compose/binaries/main/msi/Processing-*.msi
60-
./app/build/compose/binaries/main/deb/processing*.deb
79+
name: processing-${{ matrix.os_prefix }}-${{ matrix.arch }}-pr_${{ github.event.pull_request.number }}
6180
retention-days: 5
81+
path: app/build/compose/binaries/main/${{ matrix.binary }}

0 commit comments

Comments
 (0)