Skip to content

Commit e53379d

Browse files
committed
update build.yml
1 parent fa69a65 commit e53379d

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ jobs:
136136
matrix:
137137
arch: [ 'x86_64', 'arm64' ]
138138
fail-fast: false
139+
defaults:
140+
run:
141+
shell: arch -${{ matrix.arch }} bash --noprofile --norc -eo pipefail {0}
139142
steps:
140143
- name: Checkout sources
141144
uses: actions/checkout@v5
@@ -144,23 +147,19 @@ jobs:
144147
submodules: recursive
145148
- name: Install dependencies
146149
run: |
147-
arch -${{ matrix.arch }} /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
150+
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
148151
if [ "${{ matrix.arch }}" == "arm64" ]; then
149-
arch -${{ matrix.arch }} brew install cmake gcc ninja fontconfig
152+
eval "$(/opt/homebrew/bin/brew shellenv)"
150153
else
151-
arch -${{ matrix.arch }} /usr/local/bin/brew install cmake gcc ninja fontconfig
154+
eval "$(/usr/local/bin/brew shellenv)"
152155
fi
156+
brew install cmake gcc ninja fontconfig
153157
- name: Configure
154158
run: cmake --preset "macos-ci-${{ matrix.arch }}"
155159
- name: Build and Package
156160
run: |
157-
if [ "${{ matrix.arch }}" == "arm64" ]; then
158-
arch -${{ matrix.arch }} cmake --build .
159-
arch -${{ matrix.arch }} cpack --config CPackConfig.cmake
160-
else
161-
arch -${{ matrix.arch }} /usr/local/bin/cmake --build .
162-
arch -${{ matrix.arch }} /usr/local/bin/cpack --config CPackConfig.cmake
163-
fi
161+
cmake --build .
162+
cpack --config CPackConfig.cmake
164163
working-directory: build
165164
- name: Upload artifacts
166165
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)