File tree Expand file tree Collapse file tree 1 file changed +16
-4
lines changed Expand file tree Collapse file tree 1 file changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -119,6 +119,10 @@ jobs:
119
119
matrix :
120
120
arch : [arm64, x86_64]
121
121
generator : ["Unix Makefiles", Ninja]
122
+ include :
123
+ - arch : " arm64;x86_64"
124
+ generator : Ninja
125
+ arch_name : universal
122
126
123
127
steps :
124
128
# Install latest CMake.
@@ -128,10 +132,18 @@ jobs:
128
132
with :
129
133
submodules : recursive
130
134
135
+ - name : Set arch name
136
+ run : |
137
+ if [ -z "${{ matrix.arch_name }}" ]; then
138
+ echo "arch_name=${{ matrix.arch }}" >> $GITHUB_ENV
139
+ else
140
+ echo "arch_name=${{ matrix.arch_name }}" >> $GITHUB_ENV
141
+ fi
142
+
131
143
- name : CMake
132
144
run : |
133
145
mkdir cbuild
134
- cmake -S . -B cbuild/ -DCRASHPAD_BUILD_EXAMPLES=TRUE -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DCMAKE_OSX_SYSROOT=$(xcrun --sdk macosx --show-sdk-path) -G "${{ matrix.generator }}"
146
+ cmake -S . -B cbuild/ -DCRASHPAD_BUILD_EXAMPLES=TRUE " -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}" -DCMAKE_OSX_SYSROOT=$(xcrun --sdk macosx --show-sdk-path) -G "${{ matrix.generator }}"
135
147
cmake --build cbuild/
136
148
137
149
- uses : ruby/setup-ruby@v1
@@ -142,12 +154,12 @@ jobs:
142
154
143
155
- name : Crashpad distribution ZIP
144
156
run : |
145
- ruby backtrace/save_artifacts.rb --output Crashpad_MacOs_build_${{ matrix.arch }}.zip
157
+ ruby backtrace/save_artifacts.rb --output Crashpad_MacOs_build_${{ env.arch_name }}.zip
146
158
147
159
- uses : actions/upload-artifact@v4
148
160
with :
149
- name : Crashpad_MacOs_build_${{ matrix.arch }}_${{ matrix.generator }}_${{ github.sha }}
150
- path : Crashpad_MacOs_build_${{ matrix.arch }}.zip
161
+ name : Crashpad_MacOs_build_${{ env.arch_name }}_${{ matrix.generator }}_${{ github.sha }}
162
+ path : Crashpad_MacOs_build_${{ env.arch_name }}.zip
151
163
152
164
build-android :
153
165
runs-on : ubuntu-22.04
You can’t perform that action at this time.
0 commit comments