vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

Use master runtime

Browse source
This commit is contained in:
Julian Sparber 2022-08-03 12:11:57 +02:00
parent 5c70961cea
commit 6ca3b6b812
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -8,7 +8,7 @@ stages:
variables:
FLATPAK_MODULE: "fractal"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
CI_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-42"
CI_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
.hack:
variables:

10
build-aux/org.gnome.Fractal.Devel.json
View file

@ -1,11 +1,11 @@
{
"app-id": "org.gnome.Fractal.Devel",
"runtime": "org.gnome.Platform",
"runtime-version": "42",
"runtime-version": "master",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm12"
"org.freedesktop.Sdk.Extension.llvm14"
],
"command": "fractal",
"finish-args": [
@ -20,8 +20,8 @@
"--env=RUST_BACKTRACE=1"
],
"build-options": {
"append-ld-library-path": "/usr/lib/sdk/llvm12/lib",
"append-path": "/usr/lib/sdk/llvm12/bin:/usr/lib/sdk/rust-stable/bin",
"append-ld-library-path": "/usr/lib/sdk/llvm14/lib",
"append-path": "/usr/lib/sdk/llvm14/bin:/usr/lib/sdk/rust-stable/bin",
"build-args": [
"--share=network"
],
@ -62,4 +62,4 @@
]
}
]
}
}

10
build-aux/org.gnome.Fractal.Hack.json
View file

@ -1,11 +1,11 @@
{
"app-id": "org.gnome.Fractal.Hack",
"runtime": "org.gnome.Platform",
"runtime-version": "42",
"runtime-version": "master",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm12"
"org.freedesktop.Sdk.Extension.llvm14"
],
"command": "fractal",
"finish-args": [
@ -20,8 +20,8 @@
"--env=RUST_BACKTRACE=1"
],
"build-options": {
"append-ld-library-path": "/usr/lib/sdk/llvm12/lib",
"append-path": "/usr/lib/sdk/llvm12/bin:/usr/lib/sdk/rust-stable/bin",
"append-ld-library-path": "/usr/lib/sdk/llvm14/lib",
"append-path": "/usr/lib/sdk/llvm14/bin:/usr/lib/sdk/rust-stable/bin",
"env": {
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold --cfg=ruma_identifiers_storage=\"Arc\"",
@ -68,4 +68,4 @@
]
}
]
}
}