Skip to content

Commit 020cfec

Browse files
authored
GNOME 47 (#982)
Technically depends on flathub/org.freedesktop.Sdk.Extension.typescript#29 Without, TypeScript support is broken. But I'll merge anyway as keeping separate sdk branches is a mess, and we can move forward and prepare the release. For now I have re-enabled Biome for JavaScript. Hopefully `org.freedesktop.Sdk.Extension.typescript//24.08` will get released soon.
1 parent 154f5ea commit 020cfec

24 files changed

Lines changed: 578 additions & 475 deletions

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ SHELL:=/bin/bash -O globstar
44

55
setup:
66
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
7-
flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//46 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm18//23.08 org.freedesktop.Sdk.Extension.node18//23.08 org.freedesktop.Sdk.Extension.typescript//23.08
7+
flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//47 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.08 org.freedesktop.Sdk.Extension.node20//24.08 #org.freedesktop.Sdk.Extension.typescript//24.08
88
# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
9-
# flatpak install --or-update --user --noninteractive flathub-beta org.freedesktop.Sdk.Extension.rust-stable//24.08beta org.freedesktop.Sdk.Extension.vala//24.08beta org.freedesktop.Sdk.Extension.llvm18//24.08beta org.freedesktop.Sdk.Extension.node18//24.08beta org.freedesktop.Sdk.Extension.typescript//24.08beta
109
# flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
1110
# flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master
1211
git submodule update --init
@@ -70,14 +69,14 @@ ci: setup build test
7069
# make sure to test without the sdk extensions installed
7170
sandbox: setup
7271
flatpak run org.flatpak.Builder --ccache --user --install --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
73-
# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm18//23.08
72+
# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.08
7473
flatpak run --command="bash" re.sonny.Workbench.Devel
7574

7675
flatpak:
7776
flatpak run org.flatpak.Builder --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
7877
# This is what Flathub does - consider moving to lint
7978
flatpak run --env=G_DEBUG=fatal-criticals --command=appstream-util org.flatpak.Builder validate flatpak/files/share/appdata/re.sonny.Workbench.Devel.appdata.xml
80-
flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//23.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop
79+
flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//24.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop
8180
# appstreamcli validate --override=release-time-missing=info /path/to/your/app.metainfo.xml
8281
flatpak run org.flatpak.Builder --run flatpak build-aux/re.sonny.Workbench.Devel.json bash
8382

blueprint-compiler

Submodule blueprint-compiler updated from adc2be1 to 8e10fcf

build-aux/modules/GTKCssLanguageServer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
"modules": [
1313
{
1414
"name": "jsonrpc-glib",
15-
"config-opts": ["--buildtype=release", "-Denable_tests=false"],
15+
"config-opts": [
16+
"--libdir=/app/lib",
17+
"--buildtype=release",
18+
"-Denable_tests=false"
19+
],
1620
"buildsystem": "meson",
1721
"sources": [
1822
{

build-aux/modules/biome.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"name": "biome",
3+
"buildsystem": "simple",
4+
"build-commands": ["chmod +x biome", "cp biome /app/bin/biome"],
5+
"sources": [
6+
{
7+
"type": "file",
8+
"dest-filename": "biome",
9+
"only-arches": ["aarch64"],
10+
"url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.9.2/biome-linux-arm64",
11+
"sha256": "b4b88a36487e5b6c7b34fdc5351f4beb57ce7d88497f57fd3474c64413aabf78"
12+
},
13+
{
14+
"type": "file",
15+
"dest-filename": "biome",
16+
"only-arches": ["x86_64"],
17+
"url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.9.2/biome-linux-x64",
18+
"sha256": "e17bb3d15fc192aa767ae7691302f4fd239e80ceaace4c3238857b9da0f43902"
19+
}
20+
]
21+
}

build-aux/modules/gom.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "gom",
33
"buildsystem": "meson",
4+
"config-opts": ["--libdir=/app/lib", "-Denable-gtk-doc=false"],
45
"sources": [
56
{
67
"type": "archive",

0 commit comments

Comments
 (0)