Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@ jobs:
permissions:
contents: write
strategy:
fail-fast: false
matrix:
include:
# compiling for arm32 needs a self-hosted runner on Raspi OS (32-bit)
@@ -82,6 +83,11 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Checkout Examples Repository
uses: actions/checkout@v4
with:
repository: processing/processing-examples
path: processing-examples
- name: Install Java
uses: actions/setup-java@v4
with:
@@ -100,7 +106,7 @@ jobs:
p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
- name: Build Release
run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ needs.version.outputs.version }}"
run: ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ needs.version.outputs.version }}" -Dplatform=${{ matrix.os_prefix }}
env:
PROCESSING_APP_PASSWORD: ${{ secrets.PROCESSING_APP_PASSWORD }}
PROCESSING_APPLE_ID: ${{ secrets.PROCESSING_APPLE_ID }}
25 changes: 17 additions & 8 deletions build/build.xml
Original file line number Diff line number Diff line change
@@ -9,21 +9,30 @@
</classpath>
</taskdef>

<!-- Sets properties for macos/windows/linux depending on current system -->
<!-- Only do OS detection if platform isn't already set by override -->
<condition property="platform" value="macos">
<os family="mac" />
<and>
<not><isset property="platform"/></not>
<os family="mac" />
</and>
</condition>

<condition property="platform" value="windows">
<os family="windows" />
<and>
<not><isset property="platform"/></not>
<os family="windows" />
</and>
</condition>

<condition property="platform" value="linux">
<and>
<os family="unix" />
<not>
<os family="mac" />
</not>
<not><isset property="platform"/></not>
<and>
<os family="unix" />
<not>
<os family="mac" />
</not>
</and>
</and>
</condition>

@@ -114,7 +123,7 @@

<!-- ${platform} ok for Windows/Linux, but 'macos' needs to be 'mac' -->
<condition property="jdk.download.os" value="mac" else="${platform}">
<os family="mac" />
<equals arg1="${platform}" arg2="macos"/>
</condition>

<!-- amd64 or x86_64 use x64, others use os.arch -->