Merge branch 'gabrybarbe-setting-tab-toolbox' into 'master'

Teams/GIMP/Design/gimp-ux#666: add option to enable/disable TAB key to show/hide toolbox Closes Teams/GIMP/Design/gimp-ux#666 See merge request GNOME/gimp!2490
build/linux: Fix Flatpak building after gexiv2 dep declaration
2025-10-05 21:02:42 +02:00 · 2025-10-05 20:14:58 +02:00 · 2025-10-05 14:53:41 -03:00 · 2025-10-05 13:45:55 -03:00 · 2025-10-05 13:41:27 -03:00
2 changed files with 3 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -395,7 +395,8 @@ gimp-debian:
    MESON_DIST: 0
  before_script:
    - export GIMP_PREFIX="${CI_PROJECT_DIR}/_install"
-  timeout: 30m
+  #30min is enough only if no module was updated/rebuilt, we need more time in case of module bumps
+  timeout: 90m

 deps-flatpak:
  extends: .flatpak
--- a/build/linux/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/linux/flatpak/org.gimp.GIMP-nightly.json
@@ -99,10 +99,8 @@
            ],
            "buildsystem": "meson",
            "config-opts": [
-                "-Dintrospection=false",
                "-Dpython3=false",
-                "-Dtools=false",
-                "-Dvapi=false"
+                "-Dtools=false"
            ],
            "modules": [
                {
Author	SHA1	Message	Date
Gabriele	f3356a3f36	Merge branch 'gabrybarbe-setting-tab-toolbox' into 'master' Teams/GIMP/Design/gimp-ux#666: add option to enable/disable TAB key to show/hide toolbox Closes Teams/GIMP/Design/gimp-ux#666 See merge request GNOME/gimp!2490	2025-10-05 20:14:58 +02:00
Bruno Lopes	ebd6e64dc8	build/linux: Fix Flatpak building after gexiv2 dep declaration	2025-10-05 14:53:41 -03:00
Bruno Lopes	4768a4283d	gitlab-ci: Add comment explaining Flatpak timeout	2025-10-05 13:45:55 -03:00
Bruno Lopes	fe4a698928	gitlab-ci: Bump Flatpak timeout for 90min again for rebuilding purposes When we bump some dependency (e.g. Poppler), even the ones which don't link to it will be rebuild, so 30min is not enough even with the ORAS caching.	2025-10-05 13:41:27 -03:00