Skip to content

Commit cec02ef

Browse files
CI: Try to fix macOS build
1 parent 3740bd9 commit cec02ef

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

.github/actions/install-dependencies/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case "$os" in
4545
if [ "$build_system" = 'meson' ]; then
4646
brew update -q && brew install qt@6 meson
4747
else
48-
brew update -q && brew install qt@6 automake libiconv
48+
brew update -q && brew install qt@6 automake
4949
fi
5050
;;
5151

.github/actions/run-action/run-action.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ case "$action" in
5151
if [ "$build_system" = 'meson' ]; then
5252
meson setup build -D qt5=true -D gtk=false
5353
else
54-
./autogen.sh && ./configure --enable-qt5 --disable-gtk
54+
autoreconf -I /usr/local/share/gettext/m4 && ./configure --enable-qt5 --disable-gtk
5555
fi
5656
;;
5757

@@ -62,9 +62,9 @@ case "$action" in
6262
if [ "$build_system" = 'meson' ]; then
6363
meson setup build -D gtk=false
6464
else
65-
export LDFLAGS="-L/opt/homebrew/opt/libiconv/lib"
66-
export CPPFLAGS="-I/opt/homebrew/opt/libiconv/include"
67-
./autogen.sh && ./configure --disable-gtk
65+
#export LDFLAGS="-L/opt/homebrew/opt/libiconv/lib"
66+
#export CPPFLAGS="-I/opt/homebrew/opt/libiconv/include"
67+
autoreconf -I /opt/homebrew/opt/gettext/share/m4 && ./configure --disable-gtk
6868
fi
6969
;;
7070

.github/workflows/c-cpp.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
os: [ubuntu-22.04, ubuntu-24.04,
14-
macos-13, macos-15,
15-
windows-2022]
16-
build-system: [autotools, meson]
13+
os: [macos-15]
14+
build-system: [autotools]
1715
fail-fast: false
1816
runs-on: ${{ matrix.os }}
1917

0 commit comments

Comments
 (0)