Skip to content

Commit

Permalink
GNOME 47 (#982)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
sonnyp authored Sep 23, 2024
1 parent 154f5ea commit 020cfec
Show file tree
Hide file tree
Showing 24 changed files with 578 additions and 475 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ SHELL:=/bin/bash -O globstar

setup:
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
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
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
# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
# 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
# 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
git submodule update --init
Expand Down Expand Up @@ -70,14 +69,14 @@ ci: setup build test
# make sure to test without the sdk extensions installed
sandbox: setup
flatpak run org.flatpak.Builder --ccache --user --install --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
# 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
# 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
flatpak run --command="bash" re.sonny.Workbench.Devel

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

Expand Down
2 changes: 1 addition & 1 deletion blueprint-compiler
Submodule blueprint-compiler updated from adc2be to 8e10fc
6 changes: 5 additions & 1 deletion build-aux/modules/GTKCssLanguageServer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
"modules": [
{
"name": "jsonrpc-glib",
"config-opts": ["--buildtype=release", "-Denable_tests=false"],
"config-opts": [
"--libdir=/app/lib",
"--buildtype=release",
"-Denable_tests=false"
],
"buildsystem": "meson",
"sources": [
{
Expand Down
21 changes: 21 additions & 0 deletions build-aux/modules/biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "biome",
"buildsystem": "simple",
"build-commands": ["chmod +x biome", "cp biome /app/bin/biome"],
"sources": [
{
"type": "file",
"dest-filename": "biome",
"only-arches": ["aarch64"],
"url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.9.2/biome-linux-arm64",
"sha256": "b4b88a36487e5b6c7b34fdc5351f4beb57ce7d88497f57fd3474c64413aabf78"
},
{
"type": "file",
"dest-filename": "biome",
"only-arches": ["x86_64"],
"url": "https://github.com/biomejs/biome/releases/download/cli%2Fv1.9.2/biome-linux-x64",
"sha256": "e17bb3d15fc192aa767ae7691302f4fd239e80ceaace4c3238857b9da0f43902"
}
]
}
1 change: 1 addition & 0 deletions build-aux/modules/gom.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "gom",
"buildsystem": "meson",
"config-opts": ["--libdir=/app/lib", "-Denable-gtk-doc=false"],
"sources": [
{
"type": "archive",
Expand Down
Loading

0 comments on commit 020cfec

Please sign in to comment.