From 13d8b6a1ee0f80b187f74d126bd678f2919a7506 Mon Sep 17 00:00:00 2001 From: technosf <535060+technosf@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:23:56 -0700 Subject: [PATCH 1/4] Update main.yml Updated elementary platform version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4575d8..ea660e6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ 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 From d72cca7310f88db2e91927044d8cbc43dd655f29 Mon Sep 17 00:00:00 2001 From: technosf <535060+technosf@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:30:58 -0700 Subject: [PATCH 2/4] Update main.yml Updating action versions --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea660e6..1599701 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,10 +18,10 @@ jobs: # 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 From 3f87e54337a2b8a1b86908f0ac2244a6e6ef0fb0 Mon Sep 17 00:00:00 2001 From: technosf <535060+technosf@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:52:26 -0700 Subject: [PATCH 3/4] Updated Meson calls and added VERSION var to build --- data/meson.build | 4 ++-- meson.build | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index 2f962e3..1ce764f 100644 --- a/data/meson.build +++ b/data/meson.build @@ -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') @@ -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') ) diff --git a/meson.build b/meson.build index 5977853..7c3fd73 100644 --- a/meson.build +++ b/meson.build @@ -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@', From a1f8e38b1f5a6c2d015f027a54e47d1f413d91fb Mon Sep 17 00:00:00 2001 From: technosf <535060+technosf@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:11:18 -0700 Subject: [PATCH 4/4] Linked Version in App to Meson build version --- po/extra/meson.build | 2 +- src/Application.vala | 2 +- src/Config.vala.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/po/extra/meson.build b/po/extra/meson.build index 526e40f..43f05c5 100644 --- a/po/extra/meson.build +++ b/po/extra/meson.build @@ -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 diff --git a/src/Application.vala b/src/Application.vala index 22e59a0..ac7417e 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -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 = "☆ "; diff --git a/src/Config.vala.in b/src/Config.vala.in index af62dcf..30582b0 100644 --- a/src/Config.vala.in +++ b/src/Config.vala.in @@ -1,2 +1,3 @@ public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@; public const string LOCALEDIR = @LOCALEDIR@; +public const string VERSION = @VERSION@;