Compare commits

...

6 Commits

Author SHA1 Message Date
Florian Müllner 4ccf12e988 Bump version to 41.0
Update NEWS.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/192>
2021-09-19 12:47:07 +02:00
Florian Müllner 74121fce78 Bump version to 41.rc.1
Update NEWS.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/191>
2021-09-06 01:40:31 +02:00
Florian Müllner 0a7491d747 build: Bump meson requirement
Passing arguments to dist scripts was only introduced after 0.44,
so bump the requirement to shut up the corresponding warning.

Meson 0.53 is the same version requirement as gnome-shell, so that
shouldn't be an issue for distributors.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/191>
2021-09-06 01:40:11 +02:00
Florian Müllner 68bf3e7ff7 ci: Fix classic build
The option name used in CI was wrong, so we did not actually build
the auxiliary classic mode file.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/190>
2021-09-06 00:41:04 +02:00
Florian Müllner 93dd8f535d ci: Init submodule
As the gnome-shell-sass submodule isn't included under subprojects,
meson doesn't handle it automatically.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/190>
2021-09-06 00:39:50 +02:00
Florian Müllner 0b993525f5 build: Check sassc errors when generating stylesheet
We currently just call sassc, but don't check its return value. That
means as long as sassc is available, the script (and therefore the
newly added dist CI job) will succeed.

Make sure we fail on failure.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/190>
2021-09-06 00:33:08 +02:00
4 changed files with 19 additions and 4 deletions
+5 -1
View File
@@ -139,8 +139,10 @@ fedora-build:
stage: build stage: build
needs: needs:
- build-fedora-container - build-fedora-container
before_script:
- git submodule update --init
script: script:
- meson setup build --werror -Dextension_set=all -Dclassic=true - meson setup build --werror -Dextension_set=all -Dclassic_mode=true
- meson compile -C build - meson compile -C build
- meson test -C build - meson test -C build
- meson install -C build - meson install -C build
@@ -155,6 +157,8 @@ fedora-dist:
stage: deploy stage: deploy
needs: needs:
- fedora-build - fedora-build
before_script:
- git submodule update --init
script: script:
- meson dist -C build - meson dist -C build
rules: rules:
+11
View File
@@ -1,3 +1,14 @@
41.0
====
* Bump version
41.rc.1
=======
* Fix pre-generating stylesheets in tarball [Florian; !190]
Contributors:
Florian Müllner
41.rc 41.rc
===== =====
* window-list: Adapt to overview-on-startup [Florian; !185] * window-list: Adapt to overview-on-startup [Florian; !185]
+2 -2
View File
@@ -1,6 +1,6 @@
project('gnome-shell-extensions', project('gnome-shell-extensions',
version: '41.rc', version: '41.0',
meson_version: '>= 0.44.0', meson_version: '>= 0.53.0',
license: 'GPL2+' license: 'GPL2+'
) )
+1 -1
View File
@@ -10,4 +10,4 @@ distroot = os.environ.get('MESON_DIST_ROOT')
stylesheet_path = PurePath('data/gnome-classic.css') stylesheet_path = PurePath('data/gnome-classic.css')
src = PurePath(sourceroot, stylesheet_path.with_suffix('.scss')) src = PurePath(sourceroot, stylesheet_path.with_suffix('.scss'))
dst = PurePath(distroot, stylesheet_path) dst = PurePath(distroot, stylesheet_path)
subprocess.call(['sassc', '-a', src, dst]) subprocess.run(['sassc', '-a', src, dst], check=True)