From 97d0a0e51475dfd7721e86271292cbb93237aba7 Mon Sep 17 00:00:00 2001 From: Yi-Jyun Pan Date: Sun, 12 Jan 2025 15:59:38 +0000 Subject: [PATCH 01/14] Update Chinese (Taiwan) translation --- po/zh_TW.po | 87 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a91c8bc5..ab8e9ea1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: gnome-shell-extensions gnome-3-0\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/" "issues\n" -"POT-Creation-Date: 2024-04-29 14:28+0000\n" -"PO-Revision-Date: 2024-07-24 10:25+0000\n" -"Last-Translator: Chao-Hsiung Liao \n" +"POT-Creation-Date: 2024-11-25 15:07+0000\n" +"PO-Revision-Date: 2025-01-12 23:57+0800\n" +"Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (Traditional) \n" "Language: zh_TW\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.6.2\n" +"X-Generator: Poedit 3.5\n" #: data/gnome-classic.desktop.in:3 msgid "GNOME Classic" @@ -38,11 +38,11 @@ msgstr "GNOME Classic 採行 Wayland" msgid "GNOME Classic on Xorg" msgstr "GNOME Classic 採行 Xorg" -#: extensions/apps-menu/extension.js:126 +#: extensions/apps-menu/extension.js:125 msgid "Favorites" msgstr "喜愛" -#: extensions/apps-menu/extension.js:397 +#: extensions/apps-menu/extension.js:399 msgid "Apps" msgstr "程式" @@ -58,11 +58,11 @@ msgstr "" "字串的列表，每個都包含一個應用程式 id (桌面檔名稱)，後面接著半形分號 \";\" 與" "工作區號碼" -#: extensions/auto-move-windows/prefs.js:159 +#: extensions/auto-move-windows/prefs.js:156 msgid "Workspace Rules" msgstr "工作區規則" -#: extensions/auto-move-windows/prefs.js:314 +#: extensions/auto-move-windows/prefs.js:311 msgid "Add Rule" msgstr "加入規則" @@ -107,8 +107,8 @@ msgstr "" "如果為真，在對映的縮圖頂端放置視窗說明標題，凌駕 Shell 將它放置在底部的預設" "值。變更這個設定值需要重新啟動 Shell 來套用效果。" -#: extensions/places-menu/extension.js:91 -#: extensions/places-menu/extension.js:94 +#: extensions/places-menu/extension.js:75 +#: extensions/places-menu/extension.js:78 msgid "Places" msgstr "位置" @@ -223,47 +223,47 @@ msgstr "主題名稱" msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell" msgstr "主題的名稱，要從 ~/.themes/name/gnome-shell 載入" -#: extensions/window-list/extension.js:72 +#: extensions/window-list/extension.js:70 msgid "Close" msgstr "關閉" -#: extensions/window-list/extension.js:99 +#: extensions/window-list/extension.js:97 msgid "Unminimize" msgstr "取消最小化" -#: extensions/window-list/extension.js:99 +#: extensions/window-list/extension.js:97 msgid "Minimize" msgstr "最小化" -#: extensions/window-list/extension.js:106 +#: extensions/window-list/extension.js:104 msgid "Unmaximize" msgstr "取消最大化" -#: extensions/window-list/extension.js:106 +#: extensions/window-list/extension.js:104 msgid "Maximize" msgstr "最大化" -#: extensions/window-list/extension.js:471 +#: extensions/window-list/extension.js:485 msgid "Minimize all" msgstr "全部最小化" -#: extensions/window-list/extension.js:477 +#: extensions/window-list/extension.js:491 msgid "Unminimize all" msgstr "全部取消最小化" -#: extensions/window-list/extension.js:483 +#: extensions/window-list/extension.js:497 msgid "Maximize all" msgstr "全部最大化" -#: extensions/window-list/extension.js:491 +#: extensions/window-list/extension.js:505 msgid "Unmaximize all" msgstr "全部取消最大化" -#: extensions/window-list/extension.js:499 +#: extensions/window-list/extension.js:513 msgid "Close all" msgstr "全部關閉" -#: extensions/window-list/extension.js:773 +#: extensions/window-list/extension.js:780 msgid "Window List" msgstr "視窗列表" @@ -279,7 +279,7 @@ msgstr "" "決定在視窗列表中何時群組視窗。可能的數值有「never」、「auto」、「always」。" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:26 -#: extensions/window-list/prefs.js:79 +#: extensions/window-list/prefs.js:69 msgid "Show windows from all workspaces" msgstr "顯示所有工作區的視窗" @@ -297,44 +297,59 @@ msgid "" "primary one." msgstr "是否在所有連接的螢幕顯示視窗列表或是只出現在主要螢幕上。" -#: extensions/window-list/prefs.js:35 +#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:41 +msgid "Show workspace previews in window list" +msgstr "在視窗清單顯示工作區預覽" + +#: extensions/window-list/prefs.js:36 msgid "Window Grouping" msgstr "視窗群組" -#: extensions/window-list/prefs.js:40 +#: extensions/window-list/prefs.js:41 msgid "Never group windows" msgstr "永不群組視窗" -#: extensions/window-list/prefs.js:41 +#: extensions/window-list/prefs.js:42 msgid "Group windows when space is limited" msgstr "當空間受限時群組視窗" -#: extensions/window-list/prefs.js:42 +#: extensions/window-list/prefs.js:43 msgid "Always group windows" msgstr "永遠群組視窗" -#: extensions/window-list/prefs.js:66 +#: extensions/window-list/prefs.js:63 msgid "Show on all monitors" msgstr "顯示於所有螢幕" -#: extensions/window-list/workspaceIndicator.js:255 -#: extensions/workspace-indicator/extension.js:261 -msgid "Workspace Indicator" -msgstr "工作區指示器" +#: extensions/window-list/prefs.js:75 +msgid "Show workspace previews" +msgstr "顯示工作區預覽" -#: extensions/workspace-indicator/prefs.js:69 +#: extensions/workspace-indicator/prefs.js:29 +msgid "Show Previews In Top Bar" +msgstr "在頂端列顯示預覽" + +#: extensions/workspace-indicator/prefs.js:87 #, javascript-format msgid "Workspace %d" msgstr "工作區 %d" -#: extensions/workspace-indicator/prefs.js:136 +#: extensions/workspace-indicator/prefs.js:154 msgid "Workspace Names" msgstr "工作區名稱" -#: extensions/workspace-indicator/prefs.js:262 +#: extensions/workspace-indicator/prefs.js:280 msgid "Add Workspace" msgstr "新增工作區" +#: extensions/workspace-indicator/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml:12 +msgid "Show workspace previews in top bar" +msgstr "在頂端列顯示工作區預覽" + +#: extensions/workspace-indicator/workspaceIndicator.js:430 +msgid "Workspace Indicator" +msgstr "工作區指示器" + #~ msgid "Applications" #~ msgstr "應用程式" @@ -468,8 +483,8 @@ msgstr "新增工作區" #~ msgid "" #~ "Configures how the windows are shown in the switcher. Valid possibilities " -#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-" -#~ "only' (shows only the application icon) or 'both'." +#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' " +#~ "(shows only the application icon) or 'both'." #~ msgstr "" #~ "設定視窗在切換器中顯示的方式。有效的選項為「thumbnail-only」(顯示視窗的縮" #~ "圖)、「app-icon-only」(僅顯示應用程式圖示)，或「both」(兩者)" From b1f727fa34df4fd863035739171a5c738c0767f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 30 Nov 2024 14:43:14 +0100 Subject: [PATCH 02/14] places-menu: Catch errors during async operation Uncaught errors in async functions don't provide a good stack, because the unhandled promise rejection masks the error that triggered it. While we already handle *expected* errors inside the function, make sure we catch all errors to get useful stack information for unexpected errors as well. Part-of: (cherry picked from commit e0b68a319e3ec5d47b42ba720211c8d6139fdf82) --- extensions/places-menu/placeDisplay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index 930f92c6..5a65a49d 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -69,7 +69,7 @@ class PlaceInfo extends EventEmitter { await this.file.mount_enclosing_volume(0, op.mountOp, null); if (tryMount) - this._ensureMountAndLaunch(context, false); + this._ensureMountAndLaunch(context, false).catch(logError); } catch (e) { if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message); @@ -81,7 +81,7 @@ class PlaceInfo extends EventEmitter { launch(timestamp) { let launchContext = global.create_app_launch_context(timestamp, -1); - this._ensureMountAndLaunch(launchContext, true); + this._ensureMountAndLaunch(launchContext, true).catch(logError); } getIcon() { From 6400be4a6c1dc508b97ec3dd29bc4ab44aca0762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 30 Nov 2024 14:56:27 +0100 Subject: [PATCH 03/14] places-menu: Update fake mount operation source gnome-shell now checks for an associated drive to automatically cancel the operation on disconnect, so fake the corresponding method. While at it, drop the `get_icon()` method that hasn't been used for quite a while now. Closes: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/508 Part-of: (cherry picked from commit 8957f488dc9e305abb93af790ae0afc008837fbc) --- extensions/places-menu/placeDisplay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index 5a65a49d..16efadb5 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -61,8 +61,8 @@ class PlaceInfo extends EventEmitter { return; } - let source = { - get_icon: () => this.icon, + const source = { + get_drive: () => null, }; let op = new ShellMountOperation.ShellMountOperation(source); try { From fb86b18cf1b131e1307eae8c990c1bc2d4b64c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 2 Dec 2024 13:10:50 +0100 Subject: [PATCH 04/14] window-list: Fix disconnecting window signals in context menu Menus are not actors themselves, so they are not "destroyables" in terms of automatic signal disconnection, with the result that we currently leak window signals. Fix this by using the menu's actor as tracked object, so the signals are disconnected automatically when the actor is destroyed. Closes: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/474 Part-of: (cherry picked from commit 4a841dfd4977c3d497b0241c7d0016c4290b3e07) --- extensions/window-list/extension.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index cd0a6d98..bc81c76a 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -77,7 +77,7 @@ class WindowContextMenu extends PopupMenu.PopupMenu { 'notify::minimized', this._updateMinimizeItem.bind(this), 'notify::maximized-horizontally', this._updateMaximizeItem.bind(this), 'notify::maximized-vertically', this._updateMaximizeItem.bind(this), - this); + this.actor); this._updateMinimizeItem(); this._updateMaximizeItem(); From bcf0be86afe15521cb98b410438963e79ddf9e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 3 Dec 2024 12:11:55 +0100 Subject: [PATCH 05/14] window-list: Untrack chrome while in overview The window list is set up to track the monitor's fullscreen state. Monitors are never considered in fullscreen while showing the overview, so if shell's layout manager updates the fullscreen visibility after we hid the bottom bar, it ends up being visible in the overview. To avoid this, untrack the actor while the overview is visible. Closes: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/509 Part-of: (cherry picked from commit 981e8e42e20338b5488fefddf291970caf525bfc) --- extensions/window-list/extension.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index bc81c76a..e78021fe 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -772,10 +772,11 @@ class WindowList extends St.Widget { () => this._onWorkspaceMenuSet(), this); this._onWorkspaceMenuSet(); - Main.layoutManager.addChrome(this, { + const chromeOptions = { affectsStruts: true, trackFullscreen: true, - }); + }; + Main.layoutManager.addChrome(this, chromeOptions); Main.uiGroup.set_child_above_sibling(this, Main.layoutManager.panelBox); Main.ctrlAltTabManager.addGroup(this, _('Window List'), 'start-here-symbolic'); @@ -812,10 +813,12 @@ class WindowList extends St.Widget { Main.overview.connectObject( 'showing', () => { + Main.layoutManager.untrackChrome(this); this.hide(); this._updateKeyboardAnchor(); }, 'hidden', () => { + Main.layoutManager.trackChrome(this); this.visible = !this._monitor.inFullscreen; this._updateKeyboardAnchor(); }, this); From f6d4e44ee44fea63f1e259ea636247687f121703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 2 Dec 2024 14:45:42 +0100 Subject: [PATCH 06/14] workspace-indicator: Do not only exclude DESKTOP windows There are other window types that should be excluded from workspace previews, including more common ones like menus. Instead of checking for a variety of window types, delegate the decision to mutter by checking for the `skip-taskbar` property. (The internal `skip-pager` property would be more apt in this case, but as it only differs from `skip-taskbar` for X11 clients that explicitly set one and not the other, it shouldn't matter in practice) Closes: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/537 Part-of: (cherry picked from commit 77a11fd9cd9a4f7908fdf626929954491f4c13c6) --- extensions/workspace-indicator/workspaceIndicator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/workspace-indicator/workspaceIndicator.js b/extensions/workspace-indicator/workspaceIndicator.js index 18a8d4e9..9f54acbb 100644 --- a/extensions/workspace-indicator/workspaceIndicator.js +++ b/extensions/workspace-indicator/workspaceIndicator.js @@ -43,7 +43,7 @@ class WindowPreview extends St.Button { 'size-changed', () => this._checkRelayout(), 'position-changed', () => this._checkRelayout(), 'notify::minimized', this._updateVisible.bind(this), - 'notify::window-type', this._updateVisible.bind(this), + 'notify::skip-taskbar', this._updateVisible.bind(this), this); this._updateVisible(); @@ -72,7 +72,7 @@ class WindowPreview extends St.Button { } _updateVisible() { - this.visible = this._window.window_type !== Meta.WindowType.DESKTOP && + this.visible = !this._window.skip_taskbar && this._window.showing_on_its_workspace(); } } From cc3e2842a8679cbdf3abf1bf21d0e50c2d47444a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 5 Dec 2024 13:26:28 +0100 Subject: [PATCH 07/14] ci: Bump js image gnome-shell switched to F41 for its JS image, follow suit. Part-of: (cherry picked from commit b30871d105d0ab3509ff097c74cc08893d1f0bd8) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f158383..418c1f09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ stages: - deploy default: - image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/40:2024-07-11.0 + image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/41:2024-10-18.0 # Cancel jobs if newer commits are pushed to the branch interruptible: true # Auto-retry jobs in case of infra failures From 70540105201a81a848025aaa74c0539a5c5d0351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 17 Dec 2024 19:39:57 +0100 Subject: [PATCH 08/14] Revert "ci: Use `meson introspect` to generate artifact path" The new release service that now moved into production expects the tag to match the release version. Instead of using the $VERSION-real pattern in case of error, switch to a pre-push hook to hopefully prevent those errors in the first place: https://gitlab.gnome.org/-/snippets/6710 This reverts commit 8c014a6b1da26fd72001064ba7fdfd3b41103e84. Part-of: (cherry picked from commit 0d1b279a64a7988bfd362bc2883f3a2d4e0b5062) --- .gitlab-ci.yml | 21 +-------------------- .gitlab-ci/export-artifact-path | 21 --------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100755 .gitlab-ci/export-artifact-path diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 418c1f09..2dbf0c8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -149,21 +149,6 @@ fedora-build: paths: - build -fedora-distinfo: - stage: deploy - needs: - - fedora-build - script: - - .gitlab-ci/export-artifact-path build > dist.env - artifacts: - reports: - dotenv: dist.env - paths: - - build - - dist.env - rules: - - if: '$CI_COMMIT_TAG' - fedora-dist: stage: deploy needs: @@ -180,14 +165,10 @@ fedora-dist: fedora-dist-tarball: extends: fedora-dist - needs: - - fedora-distinfo artifacts: expose_as: 'Get tarball here' paths: - - $TARBALL_ARTIFACT_PATH - reports: - dotenv: dist.env + - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz rules: - if: '$CI_COMMIT_TAG' diff --git a/.gitlab-ci/export-artifact-path b/.gitlab-ci/export-artifact-path deleted file mode 100755 index f9a7534f..00000000 --- a/.gitlab-ci/export-artifact-path +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/gjs -m -// SPDX-FileCopyrightText: 2024 Florian Müllner -// -// SPDX-License-Identifier: GPL-2.0-or-later - -import Gio from 'gi://Gio'; -import {programArgs, programInvocationName, exit} from 'system'; - -const [buildDir] = programArgs; -if (!buildDir) { - printerr(`usage: ${programInvocationName} `); - exit(1); -} - -const subprocess = Gio.Subprocess.new( - ['meson', 'introspect', '--projectinfo', buildDir], - Gio.SubprocessFlags.STDOUT_PIPE); -const [, out] = subprocess.communicate_utf8(null, null); - -const {descriptive_name, version} = JSON.parse(out); -print(`TARBALL_ARTIFACT_PATH=${buildDir}/meson-dist/${descriptive_name}-${version}.tar.xz`); From aed90a3f6ca74ec70dbe3ec418e4275610cd243f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 17 Dec 2024 22:18:10 +0100 Subject: [PATCH 09/14] ci: Use variable for meson build directory This ensures that the value is consistent between jobs. Part-of: (cherry picked from commit 9f48149346ea30cfb871da4bfd2901aadd5313d3) --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dbf0c8d..27134534 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,7 @@ default: variables: FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions + MESON_BUILD_DIR: build LINT_LOG: "eslint-report.xml" workflow: @@ -141,13 +142,13 @@ fedora-build: stage: build <<: *prereview_req script: - - meson setup build --werror -Dextension_set=all -Dclassic_mode=true - - meson compile -C build - - meson test -C build - - meson install -C build + - meson setup "$MESON_BUILD_DIR" --werror -Dextension_set=all -Dclassic_mode=true + - meson compile -C "$MESON_BUILD_DIR" + - meson test -C "$MESON_BUILD_DIR" + - meson install -C "$MESON_BUILD_DIR" artifacts: paths: - - build + - "$MESON_BUILD_DIR" fedora-dist: stage: deploy @@ -156,7 +157,7 @@ fedora-dist: variables: GIT_SUBMODULE_STRATEGY: normal script: - - meson dist -C build + - meson dist -C "$MESON_BUILD_DIR" rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: @@ -168,7 +169,7 @@ fedora-dist-tarball: artifacts: expose_as: 'Get tarball here' paths: - - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz + - "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz" rules: - if: '$CI_COMMIT_TAG' From e30f634d08b096d6bc5bcfd02d24ff909d9b3977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 17 Dec 2024 22:20:26 +0100 Subject: [PATCH 10/14] ci: Move LINT_LOG variable out of global section It is only used by the eslint job, so better define it there. While at it, make sure the variable is quoted as that's considered good practice (even when safe to use unquoted as in this case). Part-of: (cherry picked from commit ea77b557e5ef6162e1e1d9bc04dd45a80ecf6ef4) --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27134534..50410dd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,6 @@ default: variables: FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions MESON_BUILD_DIR: build - LINT_LOG: "eslint-report.xml" workflow: rules: @@ -109,14 +108,16 @@ js_check: eslint: stage: review <<: *prereview_req + variables: + LINT_LOG: "eslint-report.xml" script: - export NODE_PATH=$(npm root -g) - - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit --stdout + - ./.gitlab-ci/run-eslint --output-file "$LINT_LOG" --format junit --stdout artifacts: paths: - - ${LINT_LOG} + - "$LINT_LOG" reports: - junit: ${LINT_LOG} + junit: "$LINT_LOG" potfile_js_check: stage: review From 28ac6906c24bad4545cfc3933f12204ad2435cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 17 Dec 2024 19:43:39 +0100 Subject: [PATCH 11/14] ci: Adapt to updated release module template The release module moved into production now. The process changed slightly with regard to the testing period, so we will have to adapt the existing job a bit. Part-of: (cherry picked from commit 5d8d3601b4901d7a47f3ed86b40e4b1e99f18470) --- .gitlab-ci.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50410dd3..6e2044de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,11 @@ include: - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml' - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml" - - project: 'Infrastructure/openshift-images/gnome-release-service' - file: '/ci-templates/release-module.yml' + - component: gitlab.gnome.org/GNOME/citemplates/release-service@master + inputs: + job-stage: deploy + dist-job-name: fedora-dist-tarball + tarball-artifact-path: "$TARBALL_ARTIFACT_PATH" stages: - pre_review @@ -31,6 +34,7 @@ default: variables: FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions MESON_BUILD_DIR: build + TARBALL_ARTIFACT_PATH: "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz" workflow: rules: @@ -169,15 +173,9 @@ fedora-dist-tarball: extends: fedora-dist artifacts: expose_as: 'Get tarball here' + name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" + when: always paths: - - "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz" - rules: - - if: '$CI_COMMIT_TAG' - -release-module: - stage: deploy - needs: - - fedora-dist-tarball - extends: .release-module + - "$TARBALL_ARTIFACT_PATH" rules: - if: '$CI_COMMIT_TAG' From 72b253479063a73e9b869709d99166f9caceb1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= Date: Fri, 27 Dec 2024 10:17:38 +0100 Subject: [PATCH 12/14] ci: Switch to GNOME GitLab mirror of ci-templates Part-of: (cherry picked from commit 0f69d7663b9258dda175ac5e8942c5b8def9e01c) --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e2044de..521e642f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later include: - - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml' - - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml" + - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml' + - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml" - component: gitlab.gnome.org/GNOME/citemplates/release-service@master inputs: job-stage: deploy From 176206a38c14a471ed62de920d6e565dfef3be4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 10 Jan 2025 13:40:03 +0100 Subject: [PATCH 13/14] places-menu: Remove left-over modeline This one slipped through commit 253ddb864 ... Part-of: (cherry picked from commit 83c41bad30f0cd0d05e0cd3290521565a536ccc1) --- extensions/places-menu/placeDisplay.js | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index 16efadb5..1685c040 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -6,7 +6,6 @@ // // SPDX-License-Identifier: GPL-2.0-or-later -// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- import Gio from 'gi://Gio'; import GLib from 'gi://GLib'; import Shell from 'gi://Shell'; From c815e506dd40678e50fe2b727caef8d1e429db5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 12 Jan 2025 21:59:15 +0100 Subject: [PATCH 14/14] Bump version to 47.3 Update NEWS. --- NEWS | 14 ++++++++++++++ meson.build | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f48d2263..64802596 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +47.3 +==== +* places-menu: Fix opening drives with mount operations [Florian; !361] +* window-list: Fix hiding when entering overview with gestures [Florian; !364] +* workspace-indicator: Only show previews of regular windows [Florian; !363] +* Misc. bug fixes and cleanups [Florian, Bartłomiej; !362, !365, !367, + !368, !370] + +Contributors: + Florian Müllner, Bartłomiej Piotrowski + +Translators: + Yi-Jyun Pan [zh_TW] + 47.2 ==== * places-menu: Fix a11y labelling [Florian; #542] diff --git a/meson.build b/meson.build index 873da7bd..7a64c2d8 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'gnome-shell-extensions', - version: '47.2', + version: '47.3', meson_version: '>= 1.1.0', license: 'GPL-2.0-or-later', )