Skip to content

Commit a588713

Browse files
committed
Github actions simplification
1 parent 8c3cd27 commit a588713

File tree

7 files changed

+384
-174
lines changed

7 files changed

+384
-174
lines changed

.github/actions/setup/action.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: "Setup Processing"
2+
description: "Setup the required contents for Processing to build"
3+
inputs:
4+
arch:
5+
description: 'Architecture of the JDK to download'
6+
required: false
7+
runs:
8+
using: "composite"
9+
steps:
10+
- name: Install Java
11+
uses: actions/setup-java@v4
12+
with:
13+
java-version: '17'
14+
distribution: 'temurin'
15+
architecture: ${{ inputs.arch }}
16+
17+
- name: Setup Gradle
18+
uses: gradle/actions/setup-gradle@v4

.github/workflows/build.yml

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ on:
44
paths-ignore:
55
- '**/*.md'
66
- '.all-contributorsrc'
7+
pull_request:
8+
paths-ignore:
9+
- '**/*.md'
10+
branches:
11+
- main
12+
713

814
jobs:
915
test:
@@ -12,13 +18,9 @@ jobs:
1218
steps:
1319
- name: Checkout Repository
1420
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
21+
22+
- name: Setup Processing
23+
uses: ./.github/actions/setup
2224

2325
- name: Build with Gradle
2426
run: ./gradlew test
@@ -33,11 +35,11 @@ jobs:
3335
- os: ubuntu-24.04-arm
3436
os_prefix: linux
3537
arch: aarch64
36-
binary: processing*.snap
38+
binary: deb/processing*.deb
3739
- os: ubuntu-latest
3840
os_prefix: linux
3941
arch: x64
40-
binary: processing*.snap
42+
binary: deb/processing*.deb
4143
- os: windows-latest
4244
os_prefix: windows
4345
arch: x64
@@ -51,25 +53,13 @@ jobs:
5153
arch: aarch64
5254
binary: dmg/Processing-*.dmg
5355
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-
6156
- name: Checkout Repository
6257
uses: actions/checkout@v4
63-
- name: Install Java
64-
uses: actions/setup-java@v4
65-
with:
66-
java-version: '17'
67-
distribution: 'temurin'
68-
architecture: ${{ matrix.arch }}
69-
- name: Setup Gradle
70-
uses: gradle/actions/setup-gradle@v4
7158

72-
- name: Build with Gradle
59+
- name: Setup Processing
60+
uses: ./.github/actions/setup
61+
62+
- name: Package Processing with Gradle
7363
run: ./gradlew packageDistributionForCurrentOS
7464

7565
- name: Add artifact

.github/workflows/pr.yml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ jobs:
1313
steps:
1414
- name: Checkout Repository
1515
uses: actions/checkout@v4
16-
- name: Install Java
17-
uses: actions/setup-java@v4
1816
with:
19-
java-version: '17'
20-
distribution: 'temurin'
21-
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v4
17+
fetch-depth: 0
18+
19+
- name: Setup Processing
20+
uses: ./.github/actions/setup
2321

2422
- name: Build with Gradle
2523
run: ./gradlew test
@@ -34,11 +32,11 @@ jobs:
3432
- os: ubuntu-24.04-arm
3533
os_prefix: linux
3634
arch: aarch64
37-
binary: processing*.snap
35+
binary: deb/processing*.deb
3836
- os: ubuntu-latest
3937
os_prefix: linux
4038
arch: x64
41-
binary: processing*.snap
39+
binary: deb/processing*.deb
4240
- os: windows-latest
4341
os_prefix: windows
4442
arch: x64
@@ -52,23 +50,11 @@ jobs:
5250
arch: aarch64
5351
binary: dmg/Processing-*.dmg
5452
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-
6253
- name: Checkout Repository
6354
uses: actions/checkout@v4
64-
- name: Install Java
65-
uses: actions/setup-java@v4
66-
with:
67-
java-version: '17'
68-
distribution: 'temurin'
69-
architecture: ${{ matrix.arch }}
70-
- name: Setup Gradle
71-
uses: gradle/actions/setup-gradle@v4
55+
56+
- name: Setup Processing
57+
uses: ./.github/actions/setup
7258

7359
- name: Build with Gradle
7460
run: ./gradlew packageDistributionForCurrentOS

0 commit comments

Comments
 (0)