Skip to content

Commit 3944013

Browse files
author
Ihor Dutchak
committed
Add CI for macOS Universal build
1 parent 9fdcc93 commit 3944013

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff 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,6 +132,14 @@ 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
@@ -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

0 commit comments

Comments
 (0)