Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build update #118

Merged
merged 4 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ jobs:

# This job runs in a special container designed for building Flatpaks for AppCenter
container:
image: ghcr.io/elementary/flatpak-platform/runtime:6
image: ghcr.io/elementary/flatpak-platform/runtime:8
options: --privileged

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Builds your flatpak manifest using the Flatpak Builder action
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
with:
# This is the name of the Bundle file we're building and can be anything you like
bundle: Tuner.flatpak
Expand Down
4 changes: 2 additions & 2 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endforeach
i18n.merge_file (
input: meson.project_name () + '.desktop.in',
output: meson.project_name () + '.desktop',
po_dir: join_paths (meson.source_root (), 'po', 'extra'),
po_dir: join_paths (meson.project_source_root(), 'po', 'extra'),
type: 'desktop',
install: true,
install_dir: join_paths (get_option ('datadir'), 'applications')
Expand All @@ -26,7 +26,7 @@ i18n.merge_file (
i18n.merge_file (
input: meson.project_name () + '.appdata.xml.in',
output: meson.project_name () + '.appdata.xml',
po_dir: join_paths (meson.source_root (), 'po', 'extra'),
po_dir: join_paths (meson.project_source_root(), 'po', 'extra'),
install: true,
install_dir: join_paths (get_option ('datadir'), 'metainfo')
)
Expand Down
1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ add_project_arguments (
config_data = configuration_data()
config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
config_data.set_quoted('VERSION', meson.project_version())
config_file = configure_file(
input: 'src/Config.vala.in',
output: '@BASENAME@',
Expand Down
2 changes: 1 addition & 1 deletion po/extra/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Install metadata translations
i18n.gettext ('extra',
args: [
'--directory=' + meson.source_root (),
'--directory=' + meson.project_source_root(),
'--from-code=UTF-8'
],
install: false
Expand Down
2 changes: 1 addition & 1 deletion src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class Tuner.Application : Gtk.Application {

public Window window;

public const string APP_VERSION = "1.5.3";
public const string APP_VERSION = VERSION;
public const string APP_ID = "com.github.louis77.tuner";
public const string STAR_CHAR = "★ ";
public const string UNSTAR_CHAR = "☆ ";
Expand Down
1 change: 1 addition & 0 deletions src/Config.vala.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
public const string LOCALEDIR = @LOCALEDIR@;
public const string VERSION = @VERSION@;