From 0a3aab0ccf8d7996a74a22deb1c9423162c344df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Thu, 25 Nov 2021 16:15:11 +0100 Subject: [PATCH] ci: cover more features on Linux and Windows, remove flickcurl --- .ci/Dockerfile | 1 - .github/workflows/ci.yml | 44 +++++++++++++++++---------------- .github/workflows/manualrun.yml | 1 - .github/workflows/nightly.yml | 41 +++++++++++++++--------------- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 6bbf51f157f3..64487ba0f512 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -76,7 +76,6 @@ RUN rm -rf /var/lib/apt/lists/* && apt-get update && \ libcups2-dev \ libcurl4-gnutls-dev \ libexiv2-dev \ - libflickcurl-dev \ libgdk-pixbuf2.0-dev \ libglib2.0-dev \ libgphoto2-dev \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b4f80eac6b7..77e242c52d49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -262,7 +262,6 @@ jobs: libcups2-dev \ libcurl4-gnutls-dev \ libexiv2-dev \ - libflickcurl-dev \ libgdk-pixbuf2.0-dev \ libglib2.0-dev \ libgphoto2-dev \ @@ -280,9 +279,11 @@ jobs: libosmgpsmap-1.0-dev \ libpango1.0-dev \ libpng-dev \ + libportmidi-dev \ libpugixml-dev \ librsvg2-dev \ libsaxon-java \ + libsdl2-dev \ libsecret-1-dev \ libsoup2.4-dev \ libsqlite3-dev \ @@ -379,38 +380,39 @@ jobs: mingw-w64-x86_64-cmake mingw-w64-x86_64-cmocka mingw-w64-x86_64-ninja - mingw-w64-x86_64-libxml2 - mingw-w64-x86_64-pugixml - mingw-w64-x86_64-libjpeg-turbo - mingw-w64-x86_64-zlib + mingw-w64-x86_64-nsis + mingw-w64-x86_64-dbus-glib + mingw-w64-x86_64-drmingw mingw-w64-x86_64-exiv2 + mingw-w64-x86_64-gettext + mingw-w64-x86_64-gmic + mingw-w64-x86_64-graphicsmagick + mingw-w64-x86_64-gtk3 + mingw-w64-x86_64-iso-codes mingw-w64-x86_64-lcms2 mingw-w64-x86_64-lensfun - mingw-w64-x86_64-dbus-glib - mingw-w64-x86_64-openexr - mingw-w64-x86_64-sqlite3 - mingw-w64-x86_64-libxslt - mingw-w64-x86_64-libsoup mingw-w64-x86_64-libavif + mingw-w64-x86_64-libexif + mingw-w64-x86_64-libgphoto2 mingw-w64-x86_64-libheif - mingw-w64-x86_64-libwebp + mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libsecret + mingw-w64-x86_64-libsoup + mingw-w64-x86_64-libwebp + mingw-w64-x86_64-libxml2 + mingw-w64-x86_64-libxslt mingw-w64-x86_64-lua - mingw-w64-x86_64-graphicsmagick + mingw-w64-x86_64-openexr mingw-w64-x86_64-openjpeg2 - mingw-w64-x86_64-gtk3 - mingw-w64-x86_64-libexif mingw-w64-x86_64-osm-gps-map - mingw-w64-x86_64-libgphoto2 - mingw-w64-x86_64-drmingw - mingw-w64-x86_64-gettext + mingw-w64-x86_64-portmidi + mingw-w64-x86_64-pugixml mingw-w64-x86_64-python3 - mingw-w64-x86_64-iso-codes mingw-w64-x86_64-python3-jsonschema - mingw-w64-x86_64-python3-six mingw-w64-x86_64-python3-setuptools - mingw-w64-x86_64-gmic - mingw-w64-x86_64-nsis + mingw-w64-x86_64-python3-six + mingw-w64-x86_64-sqlite3 + mingw-w64-x86_64-zlib update: true - uses: actions/checkout@v2 with: diff --git a/.github/workflows/manualrun.yml b/.github/workflows/manualrun.yml index 0b6f0423a436..e8d5215eb118 100644 --- a/.github/workflows/manualrun.yml +++ b/.github/workflows/manualrun.yml @@ -71,7 +71,6 @@ jobs: libcups2-dev \ libcurl4-gnutls-dev \ libexiv2-dev \ - libflickcurl-dev \ libgdk-pixbuf2.0-dev \ libglib2.0-dev \ libgphoto2-dev \ diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6e2535472b0f..9d6356a00a1d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -41,38 +41,39 @@ jobs: mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja - mingw-w64-x86_64-libxml2 - mingw-w64-x86_64-pugixml - mingw-w64-x86_64-libjpeg-turbo - mingw-w64-x86_64-zlib + mingw-w64-x86_64-nsis + mingw-w64-x86_64-dbus-glib + mingw-w64-x86_64-drmingw mingw-w64-x86_64-exiv2 + mingw-w64-x86_64-gettext + mingw-w64-x86_64-gmic + mingw-w64-x86_64-graphicsmagick + mingw-w64-x86_64-gtk3 + mingw-w64-x86_64-iso-codes mingw-w64-x86_64-lcms2 mingw-w64-x86_64-lensfun - mingw-w64-x86_64-dbus-glib - mingw-w64-x86_64-openexr - mingw-w64-x86_64-sqlite3 - mingw-w64-x86_64-libxslt - mingw-w64-x86_64-libsoup mingw-w64-x86_64-libavif + mingw-w64-x86_64-libexif + mingw-w64-x86_64-libgphoto2 mingw-w64-x86_64-libheif - mingw-w64-x86_64-libwebp + mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libsecret + mingw-w64-x86_64-libsoup + mingw-w64-x86_64-libwebp + mingw-w64-x86_64-libxml2 + mingw-w64-x86_64-libxslt mingw-w64-x86_64-lua - mingw-w64-x86_64-graphicsmagick + mingw-w64-x86_64-openexr mingw-w64-x86_64-openjpeg2 - mingw-w64-x86_64-gtk3 - mingw-w64-x86_64-libexif mingw-w64-x86_64-osm-gps-map - mingw-w64-x86_64-libgphoto2 - mingw-w64-x86_64-drmingw - mingw-w64-x86_64-gettext + mingw-w64-x86_64-portmidi + mingw-w64-x86_64-pugixml mingw-w64-x86_64-python3 - mingw-w64-x86_64-iso-codes mingw-w64-x86_64-python3-jsonschema - mingw-w64-x86_64-python3-six mingw-w64-x86_64-python3-setuptools - mingw-w64-x86_64-gmic - mingw-w64-x86_64-nsis + mingw-w64-x86_64-python3-six + mingw-w64-x86_64-sqlite3 + mingw-w64-x86_64-zlib update: true - uses: actions/checkout@v2 with: