Skip to content
This repository has been archived by the owner on Dec 1, 2024. It is now read-only.

Commit

Permalink
chore: update flatpak workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ppvan committed Apr 19, 2024
1 parent 365b0f7 commit 0c763a6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
name: "Flatpak"
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:gnome-44
image: bilelmoussaoui/flatpak-github-actions:gnome-46
options: --privileged
steps:
- uses: actions/checkout@v4
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: palette.flatpak
bundle: me.ppvan.psequel.flatpak
manifest-path: me.ppvan.psequel.json
cache-key: flatpak-builder-${{ github.sha }}
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# This is just a file for me to type command faster, not the build file.


debug: clean
ninja -C build/ && G_MESSAGES_DEBUG=Psequel ./build/src/psequel
debug:
ninja -C build/ && G_MESSAGES_DEBUG=Psequel ./build/src/me.ppvan.psequel

clean:
rm -rf build/res
Expand All @@ -11,7 +10,9 @@ test:
ninja -C build/ && ./build/test/psequel-test

flatpak:
flatpak-builder _build/ me.ppvan.psequel.Devel.json --force-clean
flatpak-builder build-aux/ me.ppvan.psequel.json --force-clean
flatpak build-export export build-aux
flatpak build-bundle export me.ppvan.psequel.flatpak --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo

run:
G_MESSAGES_DEBUG=Psequel ./build/src/psequel
G_MESSAGES_DEBUG=Psequel ./build/src/me.ppvan.psequel
9 changes: 4 additions & 5 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ psequel_sources = files(
'repositories/ConnectionRepository.vala',
'repositories/QueryRepository.vala',
'repositories/SchemaRepository.vala',
'services/Container.vala',
'services/Container.vala',
'services/ExportService.vala',
'services/MigrationService.vala',
'services/NavigationService.vala',
Expand All @@ -33,10 +33,6 @@ psequel_sources = files(
'viewmodels/ViewDataViewModel.vala',
'viewmodels/ViewStructureViewModel.vala',
'viewmodels/ViewViewModel.vala',



# 'models/utils.vala',

)

Expand Down Expand Up @@ -120,7 +116,10 @@ add_project_arguments(
'-Wall',
'-Wno-pointer-sign',
'-Wno-deprecated-declarations',
'-Wno-format',
'-Wno-unused',
'-Wno-address',
'-Wno-switch',
'-Wno-incompatible-pointer-types',
'-Wno-discarded-qualifiers',
],
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/ConnectionRepository.vala
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class ConnectionRepository : Object {

connection.id = db.last_insert_rowid();

debug("id = %lli", connection.id);
debug("id = %lld", connection.id);

return(connection);
}
Expand Down

0 comments on commit 0c763a6

Please sign in to comment.