summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Schleifer <js@nil.im>2024-04-22 23:49:10 +0200
committerEli Schwartz <eschwartz93@gmail.com>2024-04-28 03:14:29 -0400
commit538abcf8b130932c05b9bf4c1d9e185183c95f73 (patch)
tree10e0c6a7114bf4f3737e1cf2d7d882592b268611
parent6c6529337e72812a64ff4a193d1888cc7822de58 (diff)
downloadmeson-538abcf8b130932c05b9bf4c1d9e185183c95f73.tar.gz
Install ObjFW on macOS, Fedora and MSYS2 CI
-rw-r--r--.github/workflows/macos.yml2
-rw-r--r--.github/workflows/msys2.yml1
-rwxr-xr-xci/ciimage/fedora/install.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 0e68d241e..449504096 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -96,7 +96,7 @@ jobs:
find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
# use python3 from homebrew because it is a valid framework, unlike the actions one:
# https://github.com/actions/setup-python/issues/58
- - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses
+ - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw
- run: |
python3 -m pip install --upgrade setuptools
python3 -m pip install --upgrade pip
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index fe28a67ed..278954c39 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -85,6 +85,7 @@ jobs:
mingw-w64-${{ matrix.MSYS2_ARCH }}-python-setuptools
mingw-w64-${{ matrix.MSYS2_ARCH }}-python-pip
mingw-w64-${{ matrix.MSYS2_ARCH }}-python-fastjsonschema
+ mingw-w64-${{ matrix.MSYS2_ARCH }}-objfw
mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.TOOLCHAIN }}
- name: Install dependencies
diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh
index 2191a707e..65b2012d5 100755
--- a/ci/ciimage/fedora/install.sh
+++ b/ci/ciimage/fedora/install.sh
@@ -12,7 +12,7 @@ pkgs=(
boost-python3-devel
itstool gtk3-devel java-latest-openjdk-devel gtk-doc llvm-devel clang-devel SDL2-devel graphviz-devel zlib zlib-devel zlib-static
#hdf5-openmpi-devel hdf5-devel netcdf-openmpi-devel netcdf-devel netcdf-fortran-openmpi-devel netcdf-fortran-devel scalapack-openmpi-devel
- doxygen vulkan-devel vulkan-validation-layers-devel openssh mercurial gtk-sharp2-devel libpcap-devel gpgme-devel
+ doxygen vulkan-devel vulkan-validation-layers-devel openssh objfw mercurial gtk-sharp2-devel libpcap-devel gpgme-devel
qt5-qtbase-devel qt5-qttools-devel qt5-linguist qt5-qtbase-private-devel
libwmf-devel valgrind cmake openmpi-devel nasm gnustep-base-devel gettext-devel ncurses-devel
libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel libgcrypt-devel wayland-devel wayland-protocols-devel