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:
119119 matrix :
120120 arch : [arm64, x86_64]
121121 generator : ["Unix Makefiles", Ninja]
122+ include :
123+ - arch : " arm64;x86_64"
124+ generator : Ninja
125+ arch_name : universal
122126
123127 steps :
124128 # Install latest CMake.
@@ -128,10 +132,18 @@ jobs:
128132 with :
129133 submodules : recursive
130134
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+
131143 - name : CMake
132144 run : |
133145 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 }}"
135147 cmake --build cbuild/
136148
137149 - uses : ruby/setup-ruby@v1
@@ -142,12 +154,12 @@ jobs:
142154
143155 - name : Crashpad distribution ZIP
144156 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
146158
147159 - uses : actions/upload-artifact@v4
148160 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
151163
152164 build-android :
153165 runs-on : ubuntu-22.04
You can’t perform that action at this time.
0 commit comments