File tree Expand file tree Collapse file tree 2 files changed +25
-9
lines changed Expand file tree Collapse file tree 2 files changed +25
-9
lines changed Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ jobs:
100
100
p12-file-base64 : ${{ secrets.CERTIFICATES_P12 }}
101
101
p12-password : ${{ secrets.CERTIFICATES_P12_PASSWORD }}
102
102
- name : Build Release
103
- run : ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ needs.version.outputs.version }}"
103
+ run : ant -noinput -buildfile build/build.xml ${{ matrix.os_prefix }}-dist -Dversion="${{ needs.version.outputs.version }}" -Dplatform.override=${{ matrix.os_prefix }}
104
104
env :
105
105
PROCESSING_APP_PASSWORD : ${{ secrets.PROCESSING_APP_PASSWORD }}
106
106
PROCESSING_APPLE_ID : ${{ secrets.PROCESSING_APPLE_ID }}
Original file line number Diff line number Diff line change 9
9
</classpath >
10
10
</taskdef >
11
11
12
- <!-- Sets properties for macos/windows/linux depending on current system -->
12
+ <property name =" platform.override" value =" " description =" Override OS (windows/linux/mac)" />
13
+
14
+ <!-- First check if we have an override -->
15
+ <condition property =" platform" value =" ${ platform.override } " >
16
+ <isset property =" platform.override" />
17
+ </condition >
18
+
19
+ <!-- Only do OS detection if platform isn't already set by override -->
13
20
<condition property =" platform" value =" macos" >
14
- <os family =" mac" />
21
+ <and >
22
+ <not ><isset property =" platform" /></not >
23
+ <os family =" mac" />
24
+ </and >
15
25
</condition >
16
26
17
27
<condition property =" platform" value =" windows" >
18
- <os family =" windows" />
28
+ <and >
29
+ <not ><isset property =" platform" /></not >
30
+ <os family =" windows" />
31
+ </and >
19
32
</condition >
20
33
21
34
<condition property =" platform" value =" linux" >
22
35
<and >
23
- <os family =" unix" />
24
- <not >
25
- <os family =" mac" />
26
- </not >
36
+ <not ><isset property =" platform" /></not >
37
+ <and >
38
+ <os family =" unix" />
39
+ <not >
40
+ <os family =" mac" />
41
+ </not >
42
+ </and >
27
43
</and >
28
44
</condition >
29
45
114
130
115
131
<!-- ${platform} ok for Windows/Linux, but 'macos' needs to be 'mac' -->
116
132
<condition property =" jdk.download.os" value =" mac" else =" ${ platform } " >
117
- <os family = " mac " />
133
+ <equals arg1= " ${ platform } " arg2= " macos " />
118
134
</condition >
119
135
120
136
<!-- amd64 or x86_64 use x64, others use os.arch -->
You can’t perform that action at this time.
0 commit comments