Skip to content

Commit

Permalink
🔀 Merge pull request #427 from Schneegans/feature/rawhide
Browse files Browse the repository at this point in the history
  • Loading branch information
Schneegans authored Feb 27, 2024
2 parents abfa57a + 8426219 commit d59fda2
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 27 deletions.
22 changes: 1 addition & 21 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -111,7 +91,7 @@ jobs:
matrix:
version:
- "39"
#- "rawhide"
- "rawhide"
session:
- "gnome-xsession"
- "gnome-wayland-nested"
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/references.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# SPDX-FileCopyrightText: Simon Schneegans <[email protected]>
# 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/
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)." ; \
Expand All @@ -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)." ; \
Expand Down
3 changes: 2 additions & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/generate-references.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified tests/references/portal-close-gnome-wayland-nested-rawhide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/references/portal-close-gnome-xsession-rawhide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/references/portal-open-gnome-wayland-nested-rawhide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/references/portal-open-gnome-xsession-rawhide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d59fda2

Please sign in to comment.