Skip to content

Commit 8049c35

Browse files
committed
.github/workflows/build.yml: run Meson manually without BSFishy/meson-build
This is simple enough. (Only Windows targets still use BSFishy/meson-build until I figure out how to install Meson on Windows.)
1 parent a62bf12 commit 8049c35

File tree

1 file changed

+25
-22
lines changed

1 file changed

+25
-22
lines changed

.github/workflows/build.yml

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,21 @@ jobs:
3939
with:
4040
key: linux-iconv=${{ matrix.iconv }}
4141

42-
- name: Meson Build
43-
uses: BSFishy/meson-build@v1.0.3
44-
with:
45-
action: build
46-
directory: output
47-
setup-options: -Ddocumentation=disabled -Dwrap_mode=nofallback -Dtest=true -Diconv=${{ matrix.iconv }}
42+
- name: Configure
43+
run: |
44+
meson setup \
45+
-Ddocumentation=disabled \
46+
-Dtest=true \
47+
-Diconv=${{ matrix.iconv }} \
48+
--wrap-mode nofallback \
49+
${{ matrix.meson_options }} \
50+
output
51+
52+
- name: Build
53+
run: meson compile -C output --verbose
4854

4955
- name: Unit Tests
50-
uses: BSFishy/meson-build@v1.0.3
51-
with:
52-
action: test
53-
directory: output
54-
setup-options: -Ddocumentation=disabled -Dwrap_mode=nofallback -Dtest=true -Diconv=${{ matrix.iconv }}
56+
run: meson test -C output --print-errorlogs
5557

5658
build-macos:
5759
runs-on: macos-latest
@@ -73,19 +75,20 @@ jobs:
7375
libmpdclient \
7476
check
7577
76-
- name: Meson Build
77-
uses: BSFishy/meson-build@v1.0.3
78-
with:
79-
action: build
80-
directory: output
81-
setup-options: -Ddocumentation=disabled -Dwrap_mode=nofallback -Dtest=true
78+
- name: Configure
79+
run: |
80+
meson setup \
81+
-Ddocumentation=disabled \
82+
-Dtest=true \
83+
--wrap-mode nofallback \
84+
${{ matrix.meson_options }} \
85+
output
86+
87+
- name: Build
88+
run: meson compile -C output --verbose
8289

8390
- name: Unit Tests
84-
uses: BSFishy/meson-build@v1.0.3
85-
with:
86-
action: test
87-
directory: output
88-
setup-options: -Ddocumentation=disabled -Dwrap_mode=nofallback -Dtest=true
91+
run: meson test -C output --print-errorlogs
8992

9093
build-windows:
9194
runs-on: windows-latest

0 commit comments

Comments
 (0)