Switch back devel to 46 again (#966)

sonnyp · web-flow · commit 669d808c8935 · 2024-07-11T16:59:20.000+02:00
Nightly is too broken at this stage
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -22,8 +22,7 @@ jobs:
 
       - name: Install host dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install flatpak mutter
+          sudo apt-get install flatpak mutter flatpak-builder
 
       # Restore caches
       - name: Restore Flatpak dependencies
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -16,12 +16,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         name: "Build"
         with:
           bundle: re.sonny.Workbench.Devel.flatpak
           manifest-path: build-aux/re.sonny.Workbench.Devel.json
           cache-key: flatpak-builder-${{ github.sha }}
+
       - uses: flatpak/flatpak-github-actions/flat-manager@v6
         name: "Deploy"
         with:
diff --git a/Makefile b/Makefile
@@ -5,19 +5,22 @@ 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.node20//23.08 org.freedesktop.Sdk.Extension.typescript//23.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.node20//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
+# 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.node20//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
 	npm install --no-fund
 	@echo "✅ You can use "make build" to build Workbench"
 
 stable:
-	flatpak run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
+# flatpak --user run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
+	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
 
 devel:
-	flatpak run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+# flatpak --user run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+
 
 build: devel
 
diff --git a/build-aux/library.js b/build-aux/library.js
@@ -218,10 +218,10 @@ async function copyDirectory(source, destination) {
   }
 }
 
-const keyFile = new GLib.KeyFile();
-keyFile.load_from_file("/.flatpak-info", GLib.KeyFileFlags.NONE);
+const key_file = new GLib.KeyFile();
+key_file.load_from_file("/.flatpak-info", GLib.KeyFileFlags.NONE);
 // runtime/org.gnome.Sdk/x86_64/master
-const [, , , runtime_version] = keyFile
+const [, , , runtime_version] = key_file
   .get_string("Application", "runtime")
   .split("/");
 
@@ -236,8 +236,6 @@ function isDemoCompatible(demo) {
     return true;
   }
 
-  console.log(+runtime_version, +demo_runtime_version);
-
   return +runtime_version >= +demo_runtime_version;
 }
 
diff --git a/build-aux/modules/libshumate.json b/build-aux/modules/libshumate.json
@@ -5,8 +5,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/libshumate/1.3/libshumate-1.3.alpha.tar.xz",
-      "sha256": "e23005a63342471c37dcfa104341c5a9b96a10255beb52a87f9e994ff0f99312"
+      "url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.2.tar.xz",
+      "sha256": "6f587579f7f2d60b38d3f4727eb1a8d2feac9cbdc018e53ff5f772a8608fa44b"
     }
   ],
   "modules": [
@@ -29,8 +29,8 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz",
-          "sha256": "26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb"
+          "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.5.0/protobuf-c-1.5.0.tar.gz",
+          "sha256": "7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98"
         }
       ]
     }
diff --git a/build-aux/modules/vte.json b/build-aux/modules/vte.json
@@ -10,8 +10,9 @@
   ],
   "sources": [
     {
-      "type": "git",
-      "url": "https://gitlab.gnome.org/GNOME/vte.git"
+      "type": "archive",
+      "url": "https://download.gnome.org/sources/vte/0.76/vte-0.76.2.tar.xz",
+      "sha256": "e3dc6082d5bd70f8aafaaad2cdfcaf7e51da6ba00a919b11ddac6efa09c72847"
     }
   ]
 }
diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json",
   "id": "re.sonny.Workbench.Devel",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "master",
+  "runtime-version": "46",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",
diff --git a/data/meson.build b/data/meson.build
@@ -24,9 +24,11 @@ appstream_file = configure_file(
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
-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]
+appstreamcli = find_program('appstreamcli', required: false)
+test(
+  'Validate appstream file',
+  appstreamcli,
+  args: ['validate', '--no-net', '--explain', appstream_file],
 )
 
 configure_file(
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/cli/main.js b/src/cli/main.js
diff --git a/src/proposals.json b/src/proposals.json

Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,10 @@ async function copyDirectory(source, destination) {`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`221`		`-const keyFile = new GLib.KeyFile();`
`222`		`-keyFile.load_from_file("/.flatpak-info", GLib.KeyFileFlags.NONE);`
	`221`	`+const key_file = new GLib.KeyFile();`
	`222`	`+key_file.load_from_file("/.flatpak-info", GLib.KeyFileFlags.NONE);`
`223`	`223`	`// runtime/org.gnome.Sdk/x86_64/master`
`224`		`-const [, , , runtime_version] = keyFile`
	`224`	`+const [, , , runtime_version] = key_file`
`225`	`225`	`.get_string("Application", "runtime")`
`226`	`226`	`.split("/");`
`227`	`227`
`@@ -236,8 +236,6 @@ function isDemoCompatible(demo) {`
`236`	`236`	`return true;`
`237`	`237`	`}`
`238`	`238`
`239`		`- console.log(+runtime_version, +demo_runtime_version);`
`240`		`-`
`241`	`239`	`return +runtime_version >= +demo_runtime_version;`
`242`	`240`	`}`
`243`	`241`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`"sources": [`
`6`	`6`	`{`
`7`	`7`	`"type": "archive",`
`8`		`- "url": "https://download.gnome.org/sources/libshumate/1.3/libshumate-1.3.alpha.tar.xz",`
`9`		`- "sha256": "e23005a63342471c37dcfa104341c5a9b96a10255beb52a87f9e994ff0f99312"`
	`8`	`+ "url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.2.tar.xz",`
	`9`	`+ "sha256": "6f587579f7f2d60b38d3f4727eb1a8d2feac9cbdc018e53ff5f772a8608fa44b"`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"modules": [`
`@@ -29,8 +29,8 @@`
`29`	`29`	`"sources": [`
`30`	`30`	`{`
`31`	`31`	`"type": "archive",`
`32`		`- "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz",`
`33`		`- "sha256": "26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb"`
	`32`	`+ "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.5.0/protobuf-c-1.5.0.tar.gz",`
	`33`	`+ "sha256": "7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98"`
`34`	`34`	`}`
`35`	`35`	`]`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,9 @@`
`10`	`10`	`],`
`11`	`11`	`"sources": [`
`12`	`12`	`{`
`13`		`- "type": "git",`
`14`		`- "url": "https://gitlab.gnome.org/GNOME/vte.git"`
	`13`	`+ "type": "archive",`
	`14`	`+ "url": "https://download.gnome.org/sources/vte/0.76/vte-0.76.2.tar.xz",`
	`15`	`+ "sha256": "e3dc6082d5bd70f8aafaaad2cdfcaf7e51da6ba00a919b11ddac6efa09c72847"`
`15`	`16`	`}`
`16`	`17`	`]`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,11 @@ appstream_file = configure_file(`
`24`	`24`	`install_dir: join_paths(get_option('datadir'), 'metainfo')`
`25`	`25`	`)`
`26`	`26`
`27`		`-appstream_cli = find_program('appstreamcli', required: true)`
`28`		`-test('Validate metainfo file', appstream_cli,`
`29`		`- args: ['validate', '--override=release-time-missing=info', '--no-net', '--explain', appstream_file]`
	`27`	`+appstreamcli = find_program('appstreamcli', required: false)`
	`28`	`+test(`
	`29`	`+ 'Validate appstream file',`
	`30`	`+ appstreamcli,`
	`31`	`+ args: ['validate', '--no-net', '--explain', appstream_file],`
`30`	`32`	`)`
`31`	`33`
`32`	`34`	`configure_file(`