Skip to content

Commit

Permalink
fix: Support Builder by switching to online Flatpak build
Browse files Browse the repository at this point in the history
  • Loading branch information
mfep committed Aug 23, 2024
1 parent 5fe684a commit 93fd017
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 2,830 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ jobs:
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
with:
bundle: exercise-timer.flatpak
manifest-path: build-aux/xyz.safeworlds.hiit.Devel.yml
manifest-path: build-aux/xyz.safeworlds.hiit.Devel.json
run-tests: true
cache-key: flatpak-builder-${{ github.sha }}
51 changes: 51 additions & 0 deletions build-aux/xyz.safeworlds.hiit.Devel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"id" : "xyz.safeworlds.hiit.Devel",
"runtime" : "org.gnome.Platform",
"runtime-version" : "46",
"sdk" : "org.gnome.Sdk",
"sdk-extensions" : [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm16"
],
"command" : "hiit",
"finish-args" : [
"--share=ipc",
"--socket=fallback-x11",
"--socket=wayland",
"--socket=pulseaudio",
"--device=dri",
"--env=RUST_LOG=hiit=debug",
"--env=G_MESSAGES_DEBUG=none",
"--env=RUST_BACKTRACE=1"
],
"build-options" : {
"append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
"build-args": [
"--share=network"
],
"prepend-ld-library-path" : "/usr/lib/sdk/llvm16/lib",
"env" : {
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
"CARGO_REGISTRIES_CRATES_IO_PROTOCOL" : "sparse",
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
"CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
"CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
}
},
"modules" : [
{
"name" : "hiit",
"buildsystem" : "meson",
"run-tests" : true,
"config-opts" : [
"-Dprofile=development"
],
"sources" : [
{
"type" : "dir",
"path" : "./"
}
]
}
]
}
38 changes: 0 additions & 38 deletions build-aux/xyz.safeworlds.hiit.Devel.yml

This file was deleted.

Loading

0 comments on commit 93fd017

Please sign in to comment.