Merge pull request #868 from processing/4.3.1-arm64-fix

4.3.1 arm64 fix
processing · Dec 12, 2024 · c8db689 · c8db689
2 parents 6c8b064 + 1bd0adf
commit c8db689
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,6 +55,7 @@ jobs:
     permissions:
       contents: write
     strategy:
+      fail-fast: false
       matrix:
         include:
           # compiling for arm32 needs a self-hosted runner on Raspi OS (32-bit)
@@ -102,7 +103,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 }}

diff --git a/build/build.xml b/build/build.xml
@@ -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 -->