ci: cover more features on Linux and Windows, remove flickcurl

glasl · Nov 25, 2021 · 0a3aab0 · 0a3aab0
1 parent 5de65d1
commit 0a3aab0
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 43 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: