diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ab63e079..c908e2fa 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -79,26 +79,6 @@ jobs: run: | find $GITHUB_WORKSPACE -type f -and \( -name "*.sh" \) | xargs shellcheck - references: - name: Generate References - runs-on: ubuntu-22.04 - if: > - github.event_name == 'push' && contains(github.event.head_commit.message, '[generate-references]') - steps: - - uses: actions/checkout@v3 - - name: Download Dependencies - run: | - sudo apt update -qq - sudo apt install gettext imagemagick -qq - - name: Build Burn-My-Windows - run: make - - name: Generate References - run: sudo make references - - uses: actions/upload-artifact@v3 - with: - name: references - path: tests/references/ - build: name: Run Tests runs-on: ubuntu-22.04 @@ -111,7 +91,7 @@ jobs: matrix: version: - "39" - #- "rawhide" + - "rawhide" session: - "gnome-xsession" - "gnome-wayland-nested" diff --git a/.github/workflows/references.yml b/.github/workflows/references.yml new file mode 100644 index 00000000..9cd0a5da --- /dev/null +++ b/.github/workflows/references.yml @@ -0,0 +1,28 @@ +# SPDX-FileCopyrightText: Simon Schneegans +# SPDX-License-Identifier: CC0-1.0 + +name: Generate References + +on: + workflow_dispatch: + +jobs: + references: + name: Generate References + runs-on: ubuntu-22.04 + if: > + github.event_name == 'push' && contains(github.event.head_commit.message, '[generate-references]') + steps: + - uses: actions/checkout@v3 + - name: Download Dependencies + run: | + sudo apt update -qq + sudo apt install gettext imagemagick -qq + - name: Build Burn-My-Windows + run: make + - name: Generate References + run: sudo make references + - uses: actions/upload-artifact@v3 + with: + name: references + path: tests/references/ diff --git a/Makefile b/Makefile index 62f82213..b73b675e 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ pot: $(JS_FILES) $(UI_FILES) # This runs several tests in containerized versions of GNOME Shell. test: - @ for version in 39 ; do \ + @ for version in 39 "rawhide" ; do \ for session in "gnome-xsession" "gnome-wayland-nested" ; do \ echo ; \ echo "Running Tests on Fedora $$version ($$session)." ; \ @@ -59,7 +59,7 @@ test: # This re-generates all reference images required by the tests. references: - @ for version in 39 ; do \ + @ for version in 39 "rawhide" ; do \ for session in "gnome-xsession" "gnome-wayland-nested" ; do \ echo ; \ echo "Generating References for Fedora $$version ($$session)." ; \ diff --git a/docs/changelog.md b/docs/changelog.md index 689029fb..f2139f28 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,8 +17,9 @@ SPDX-License-Identifier: CC-BY-4.0 #### Enhancements +- The extension has been updated to work with GNOME 46. - Several translations have been updated. Thanks to all the translators! -- All CI jobs are now executed for GNOME 45 as well. +- All CI jobs are now executed for GNOME 45 and GNOME 46 as well. #### Bug Fixes diff --git a/metadata.json b/metadata.json index 2e2b1adb..5228d567 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,8 @@ "gettext-domain": "burn-my-windows", "settings-schema": "org.gnome.shell.extensions.burn-my-windows", "shell-version": [ - "45" + "45", + "46" ], "url": "https://github.com/Schneegans/Burn-My-Windows", "version": 41 diff --git a/tests/generate-references.sh b/tests/generate-references.sh index 3a6254cb..686feddc 100755 --- a/tests/generate-references.sh +++ b/tests/generate-references.sh @@ -134,7 +134,7 @@ do_in_pod 'echo "export GSK_RENDERER=cairo" >> .bash_profile' # ----------------------------------------------------- wait for the container to start up echo "Waiting for D-Bus." -do_in_pod wait-user-bus.sh > /dev/null 2>&1 +sleep 5 # ----------------------------------------------------- install the to-be-tested extension diff --git a/tests/references/portal-close-gnome-wayland-nested-rawhide.png b/tests/references/portal-close-gnome-wayland-nested-rawhide.png index a7903176..7e319c73 100644 Binary files a/tests/references/portal-close-gnome-wayland-nested-rawhide.png and b/tests/references/portal-close-gnome-wayland-nested-rawhide.png differ diff --git a/tests/references/portal-close-gnome-xsession-rawhide.png b/tests/references/portal-close-gnome-xsession-rawhide.png index 389a6924..000ec90d 100644 Binary files a/tests/references/portal-close-gnome-xsession-rawhide.png and b/tests/references/portal-close-gnome-xsession-rawhide.png differ diff --git a/tests/references/portal-open-gnome-wayland-nested-rawhide.png b/tests/references/portal-open-gnome-wayland-nested-rawhide.png index b1c6021f..29215923 100644 Binary files a/tests/references/portal-open-gnome-wayland-nested-rawhide.png and b/tests/references/portal-open-gnome-wayland-nested-rawhide.png differ diff --git a/tests/references/portal-open-gnome-xsession-rawhide.png b/tests/references/portal-open-gnome-xsession-rawhide.png index e2aea155..c7b071ec 100644 Binary files a/tests/references/portal-open-gnome-xsession-rawhide.png and b/tests/references/portal-open-gnome-xsession-rawhide.png differ diff --git a/tests/run-test.sh b/tests/run-test.sh index 77097466..a3154ccc 100755 --- a/tests/run-test.sh +++ b/tests/run-test.sh @@ -156,7 +156,7 @@ do_in_pod 'echo "export GSK_RENDERER=cairo" >> .bash_profile' # ----------------------------------------------------- wait for the container to start up echo "Waiting for D-Bus." -do_in_pod wait-user-bus.sh > /dev/null 2>&1 +sleep 5 # ----------------------------------------------------- install the to-be-tested extension