Skip to content

Commit 8c92fba

Browse files
Update meson_ci.yml
1 parent 7f0c30d commit 8c92fba

File tree

1 file changed

+16
-24
lines changed

1 file changed

+16
-24
lines changed

.github/workflows/meson_ci.yml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,12 @@ jobs:
5959
- name: Run Tests
6060
run: meson test -C builddir_msvc_${{ matrix.msvc_version }} -v --test-args='show --mode tree --verbose ci --result fail'
6161

62-
build_macos:
63-
name: Building on Xcode ${{ matrix.xcode_version }}
62+
build_macosx:
63+
name: Building on macOS with Xcode ${{ matrix.xcode_version }}
6464
runs-on: macos-latest
6565
strategy:
6666
matrix:
6767
xcode_version: ["16.0", "16.1", "16.2", "15.0", "15.1", "15.2", "15.3", "15.4"]
68-
6968
steps:
7069
- name: Checkout code
7170
uses: actions/checkout@v4
@@ -77,35 +76,28 @@ jobs:
7776
with:
7877
python-version: '3.12'
7978

80-
- name: List available Xcode versions
81-
id: xcode
82-
run: |
83-
AVAILABLE=$(ls /Applications | grep Xcode | sed 's/\.app//')
84-
# Use a here-doc to safely append multiple lines with dots or spaces
85-
cat <<EOF >> $GITHUB_ENV
86-
AVAILABLE_XCODE=$AVAILABLE
87-
EOF
88-
89-
- name: Select Xcode version
90-
run: |
91-
DESIRED="Xcode_${{ matrix.xcode_version }}"
92-
if echo "$AVAILABLE_XCODE" | grep -q "$DESIRED"; then
93-
sudo xcode-select --switch /Applications/$DESIRED.app
94-
else
95-
echo "$DESIRED not installed, using default Xcode"
96-
fi
97-
xcode-select -p
79+
- name: Install Xcode
80+
run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode_version }}.app
9881

9982
- name: Install Meson and Ninja
10083
run: |
101-
python -m pip install --upgrade pip
10284
python -m pip install meson ninja
10385
10486
- name: Configure
105-
run: meson setup builddir -Dwith_test=enabled -Dwarning_level=3
87+
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
88+
89+
- name: Compile
90+
run: meson compile -C builddir
10691

10792
- name: Run Tests
108-
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
93+
run: meson test -C builddir -v
94+
95+
- name: Upload Test Log
96+
if: failure()
97+
uses: actions/upload-artifact@v4
98+
with:
99+
name: macos_xcode_${{ matrix.xcode_version }}_meson_testlog
100+
path: builddir/meson-logs/testlog.txt
109101

110102
build_msys:
111103
name: Building on MSYS ${{ matrix.architecture }}

0 commit comments

Comments
 (0)