🔀 Merge pull request #261 from Schneegans/feature/update-ci

.github/workflows/checks.yml

@@ -89,7 +89,7 @@ jobs:
     - name: Download Dependencies
       run: |
         sudo apt update -qq
-        sudo apt install gettext -qq
+        sudo apt install gettext imagemagick -qq
     - name: Build Burn-My-Windows
       run: make
     - name: Generate References
@@ -115,6 +115,7 @@ jobs:
           - '34'
           - '35'
           - '36'
+          - '37'
         session:
           - 'gnome-xsession'
           - 'gnome-wayland-nested'

Makefile

@@ -46,7 +46,7 @@ pot: $(JS_FILES) $(UI_FILES)
 
 # This runs several tests in containerized versions of GNOME Shell.
 test:
-	@ for version in 32 33 34 35 36 ; do \
+	@ for version in 32 33 34 35 36 37 ; do \
 	  for session in "gnome-xsession" "gnome-wayland-nested" ; do \
 	    echo ; \
 	    echo "Running Tests on Fedora $$version ($$session)." ; \
@@ -57,7 +57,7 @@ test:
 
 # This re-generates all reference images required by the tests.
 references:
-	@ for version in 32 33 34 35 36 ; do \
+	@ for version in 32 33 34 35 36 37 ; do \
 	  for session in "gnome-xsession" "gnome-wayland-nested" ; do \
 	    echo ; \
 	    echo "Generating References for Fedora $$version ($$session)." ; \

tests/generate-references.sh

@@ -27,6 +27,8 @@
 #                    -v 33: GNOME Shell 3.38
 #                    -v 34: GNOME Shell 40
 #                    -v 35: GNOME Shell 41
+#                    -v 36: GNOME Shell 42
+#                    -v 37: GNOME Shell 43
 # -s session:        This can either be "gnome-xsession" or "gnome-wayland-nested".
 
 # Exit on error.
@@ -96,8 +98,7 @@ set_setting() {
 # This makes a screen capture (cropped to $CROP) inside the container and stores it
 # on the host relative to this script with the given file name.
 capture() {
-  do_in_pod import -window root -crop $CROP out.png
+  podman cp "${POD}:/opt/Xvfb_screen0" - | tar xf - --to-command "convert xwd:- -crop ${CROP} ${1}"
-  podman cp "${POD}":/home/gnomeshell/out.png "${1}"
 }
 
 # This opens the extensions preferences dialog and captures two images: One during the
@@ -134,11 +135,6 @@ podman cp "${EXTENSION}.zip" "${POD}:/home/gnomeshell"
 do_in_pod gnome-extensions install "${EXTENSION}.zip"
 
 
-# ----------------------- install gnome-terminal (this is used for testing the animations)
-
-do_in_pod sudo dnf install -y gnome-terminal
-
-
 # ---------------------------------------------------------------------- start GNOME Shell
 
 # Starting with GNOME 40, there is a "Welcome Tour" dialog popping up at first launch.

tests/run-test.sh

@@ -28,6 +28,8 @@
 #                    -v 33: GNOME Shell 3.38
 #                    -v 34: GNOME Shell 40
 #                    -v 35: GNOME Shell 41
+#                    -v 36: GNOME Shell 42
+#                    -v 37: GNOME Shell 43
 # -s session:        This can either be "gnome-xsession" or "gnome-wayland-nested".
 
 # Exit on error.
@@ -154,16 +156,10 @@ do_in_pod wait-user-bus.sh > /dev/null 2>&1
 # ----------------------------------------------------- install the to-be-tested extension
 
 echo "Installing extension."
-podman cp "tests/references" "${POD}:/home/gnomeshell/references"
 podman cp "${EXTENSION}.zip" "${POD}:/home/gnomeshell"
 do_in_pod gnome-extensions install "${EXTENSION}.zip"
 
 
-# ----------------------- install gnome-terminal (this is used for testing the animations)
-
-do_in_pod sudo dnf install -y gnome-terminal
-
-
 # ---------------------------------------------------------------------- start GNOME Shell
 
 # Starting with GNOME 40, there is a "Welcome Tour" dialog popping up at first launch.