Skip to content

Commit 2e79dce

Browse files
authored
ci: panic errors in rust and flatpak (#1484)
## What? Adds Rust requirement in flatpak, and mute panic errors (null guarded code) ## Why? Releases fail otherwise Signed-off-by: drew <me@andrinoff.com>
1 parent 9180ce8 commit 2e79dce

2 files changed

Lines changed: 17 additions & 0 deletions

File tree

clib/spelldict/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ crate-type = ["staticlib"]
1111
opt-level = 3
1212
lto = true
1313
codegen-units = 1
14+
panic = "abort"

com.floatpane.matcha.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ runtime-version: "23.08"
44
sdk: org.freedesktop.Sdk
55
sdk-extensions:
66
- org.freedesktop.Sdk.Extension.golang
7+
- org.freedesktop.Sdk.Extension.rust-stable
78

89
command: matcha
910
finish-args:
@@ -80,13 +81,28 @@ modules:
8081
Cflags: -I${includedir}
8182
Libs: -L${libdir} -lpcsclite
8283
84+
- name: spelldict
85+
buildsystem: simple
86+
build-options:
87+
append-path: /usr/lib/sdk/rust-stable/bin
88+
env:
89+
CARGO_HOME: /run/build/spelldict/cargo
90+
build-commands:
91+
- cargo build --release --manifest-path clib/spelldict/Cargo.toml
92+
- install -Dm644 clib/spelldict/target/release/libspelldict.a /app/lib/libspelldict.a
93+
- install -Dm644 clib/spelldict/spelldict.h /app/include/spelldict.h
94+
sources:
95+
- type: dir
96+
path: .
97+
8398
- name: matcha
8499
buildsystem: simple
85100
build-options:
86101
append-path: /usr/lib/sdk/golang/bin
87102
env:
88103
GOCACHE: /app/.cache/go-build
89104
GOPATH: /app/.go
105+
CGO_LDFLAGS: -L/app/lib
90106
build-args:
91107
- --share=network
92108
build-commands:

0 commit comments

Comments
 (0)