Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

46 beta #896

Merged
merged 2 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ SHELL:=/bin/bash -O globstar

setup:
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master
flatpak install --or-update --user --noninteractive flathub org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08
flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//46beta org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

org.gnome.Sdk//46beta

👯

npm install
make build

Expand Down
2 changes: 1 addition & 1 deletion build-aux/re.sonny.Workbench.Devel.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "re.sonny.Workbench.Devel",
"runtime": "org.gnome.Sdk",
"runtime-version": "master",
"runtime-version": "46beta",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.vala",
Expand Down
11 changes: 10 additions & 1 deletion data/app.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</screenshots>
<content_rating type="oars-1.1" />
<releases>
<release version="46.0" date="2024-03-xx">
<release version="46beta" date="2024-02-21">
<description translatable="no">
<ul>
<li>Use GNOME 46</li>
Expand All @@ -55,6 +55,7 @@
<li>Stop adding a superfluous newlines to end of files</li>
<li>Optimize opening Library entries</li>
<li>Open project windows maximized</li>
<li>Fix dangling bwrap processes after quitting Workbench</li>
<li>Update Biome to 1.5.3</li>
<li>Update gst-plugin-gtk4 to 0.12.1</li>
<li>Update libshumate to 1.2</li>
Expand Down Expand Up @@ -535,4 +536,12 @@
<custom>
<value key="GnomeSoftware::key-colors">[(51, 209, 122)]</value>
</custom>
<requires>
<display_length compare="ge">medium</display_length>
</requires>
<recommends>
<control>keyboard</control>
<control>pointing</control>
<control>touch</control>
</recommends>
</component>
30 changes: 12 additions & 18 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ desktop_file = configure_file(
install_dir: join_paths(get_option('datadir'), 'applications')
)

desktop_utils = find_program('desktop-file-validate', required: false)
if desktop_utils.found()
test('Validate desktop file', desktop_utils,
args: [desktop_file]
)
endif
desktop_utils = find_program('desktop-file-validate', required: true)
test('Validate desktop file', desktop_utils,
args: [desktop_file]
)

configure_file(
input: 'app.service',
Expand All @@ -26,12 +24,10 @@ appstream_file = configure_file(
install_dir: join_paths(get_option('datadir'), 'metainfo')
)

appstream_cli = find_program('appstreamcli', required: false)
if appstream_cli.found()
test('Validate metainfo file', appstream_cli,
args: ['validate', '--override=release-time-missing=info', '--no-net', '--explain', appstream_file]
)
endif
appstream_cli = find_program('appstreamcli', required: true)
test('Validate metainfo file', appstream_cli,
args: ['validate', '--override=release-time-missing=info', '--no-net', '--explain', appstream_file]
)

configure_file(
input: 'app.gschema.xml',
Expand All @@ -40,11 +36,9 @@ configure_file(
install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
)

compile_schemas = find_program('glib-compile-schemas', required: false)
if compile_schemas.found()
test('Validate schema file', compile_schemas,
args: ['--strict', '--dry-run', meson.current_source_dir()]
)
endif
compile_schemas = find_program('glib-compile-schemas', required: true)
test('Validate schema file', compile_schemas,
args: ['--strict', '--dry-run', meson.current_source_dir()]
)

install_subdir('icons/hicolor', install_dir : join_paths(get_option('datadir'), 'icons'))
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('Workbench', ['vala', 'c', 'rust'],
version: '46.0',
version: '46beta',
meson_version: '>= 0.59.0',
license: 'GPL-3.0-only'
)
Expand Down
1 change: 1 addition & 0 deletions src/init.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import "gi://GIRepository?version=2.0";
import "gi://Gtk?version=4.0";
import "gi://GtkSource?version=5";
import "gi://Adw?version=1";
Expand Down
9 changes: 0 additions & 9 deletions test/init.js

This file was deleted.

2 changes: 1 addition & 1 deletion test/isDiagnosticInRange.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "./init.js";
import "../src/init.js";

import tst, { assert } from "../troll/tst/tst.js";

Expand Down
2 changes: 1 addition & 1 deletion test/previewer.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "./init.js";
import "../src/init.js";

import WebKit from "gi://WebKit";
import Source from "gi://GtkSource";
Expand Down
2 changes: 1 addition & 1 deletion test/xml.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "./init.js";
import "../src/init.js";

import tst, { assert } from "../troll/tst/tst.js";
import { format } from "../src/langs/xml/xml.js";
Expand Down
Loading