Skip to content

Commit

Permalink
deb: update includes
Browse files Browse the repository at this point in the history
  • Loading branch information
DashieTM committed Jun 6, 2024
1 parent cc3e664 commit c297717
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 16 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
on:
release:
types: [ created ]

types: [created]
jobs:
release:
runs-on: [self-hosted, ubuntu]
Expand All @@ -15,15 +14,12 @@ jobs:
- name: Build rust package
run: cargo build --release --verbose
- name: Build Flatpak
run: |
cd flatpak
python3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json
flatpak-builder build org.Xetibo.ReSet.json --force-clean
flatpak build-export export build
flatpak build-bundle export reset.flatpak org.Xetibo.ReSet
run: "cd flatpak\npython3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json \nflatpak-builder build org.Xetibo.ReSet.json --force-clean \nflatpak build-export export build\nflatpak build-bundle export reset.flatpak org.Xetibo.ReSet\n"
- name: Build Ubuntu package
run: |
cp ./target/release/reset ./debian/.
cp ./target/release/reset ./debian/usr/bin/.
cp ./reset.desktop ./debian/share/applications/.
cp ./src/resources/icons/ReSet.svg ./debian/share/pixmaps/.
dpkg-deb --build debian
mv debian.deb reset.deb
- name: Release
Expand Down
20 changes: 18 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ license = "GPL-3.0-or-later"
[dependencies]
reset_daemon = "2.1.1"
# reset_daemon = { git = "https://github.com/Xetibo/ReSet-Daemon", branch = "dev" }
re_set-lib = "5.2.2"
# re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" }
# re_set-lib = "5.2.2"
re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib", branch = "dev" }
adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }
dbus = "0.9.7"
gtk = { version = "0.8.1", package = "gtk4", features = ["v4_12"] }
Expand Down
1 change: 1 addition & 0 deletions PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ package() {
install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
install -Dm644 "src/resources/icons/ReSet.svg" "$pkgdir/usr/share/pixmaps/ReSet.svg"
}

3 changes: 0 additions & 3 deletions debian/DEBIAN/postinstall

This file was deleted.

0 comments on commit c297717

Please sign in to comment.