From 538abcf8b130932c05b9bf4c1d9e185183c95f73 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Mon, 22 Apr 2024 23:49:10 +0200 Subject: [PATCH] Install ObjFW on macOS, Fedora and MSYS2 CI --- .github/workflows/macos.yml | 2 +- .github/workflows/msys2.yml | 1 + ci/ciimage/fedora/install.sh | 2 +- 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