From 609ae9142697aea27b18f4de94b525ffab0c0470 Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Fri, 29 Nov 2024 01:11:37 +0100
Subject: [PATCH 1/3] bump: update version to 1.0.0-beta.4 across files

Updates the version number from 1.0.0-beta.3 to 1.0.0-beta.4 in
package.json, package-lock.json, Cargo.toml, Cargo.lock, and
tauri.conf.json to reflect the latest release. This change
ensures consistency across project files and prepares for the
next deployment.
---
 package-lock.json         | 2 +-
 package.json              | 2 +-
 src-tauri/Cargo.lock      | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8479bd036..8966e690e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "iptvnator",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/package.json b/package.json
index 577e51455..a828d5808 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iptvnator",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "description": "IPTV player application.",
     "homepage": "https://github.com/4gray/iptvnator",
     "author": {
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 7dd691e4d..8fccd6de7 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "IPTVnator"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.4"
 dependencies = [
  "chrono",
  "fix-path-env",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 4d1397eb1..40586c5a3 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "IPTVnator"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.4"
 description = "IPTVnator"
 authors = ["4gray"]
 license = "MIT"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index a5991da31..bfda3678c 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
     "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
     "productName": "iptvnator",
-    "version": "1.0.0-3",
+    "version": "1.0.0-4",
     "identifier": "com.4gray.dev",
     "build": {
         "frontendDist": "../dist",

From 9a7e9ae687aff1f61f4a09a0d87cc7e6702e952c Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Fri, 29 Nov 2024 01:11:56 +0100
Subject: [PATCH 2/3] feat(ci): update release naming convention in workflow

Modifies the tagName and releaseName in the Tauri release
workflow to include platform and arguments for better
version identification. This change enhances clarity and
consistency in release management.
---
 .github/workflows/tauri-release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml
index 076f0eba5..4f791e265 100644
--- a/.github/workflows/tauri-release.yml
+++ b/.github/workflows/tauri-release.yml
@@ -61,8 +61,8 @@ jobs:
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
         with:
-          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
-          releaseName: 'App v__VERSION__'
+          tagName: v__VERSION__-${{ matrix.platform }}${{ matrix.args != '' && format('-{0}', matrix.args) || '' }}
+          releaseName: "IPTVnator v__VERSION__ (${{ matrix.platform }}${{ matrix.args != '' && format(' {0}', matrix.args) || '' }})"
           releaseBody: 'See the assets to download this version and install.'
           releaseDraft: true
           prerelease: false

From 537d30ab1e3bdb7caa57ffb3d32ac6318ad119fb Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Fri, 29 Nov 2024 01:11:46 +0100
Subject: [PATCH 3/3] feat(ci): update Docker workflow to include version
 tagging

Adds a step to install jq and retrieves the version from
package.json to tag the Docker image. This ensures that the
Docker image is versioned correctly based on the package
version, improving traceability and deployment consistency.
---
 .github/workflows/docker.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 36489cf8a..74ba2dc4b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -9,6 +9,13 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
+      -
+        name: Install jq
+        run: sudo apt-get update && sudo apt-get install -y jq
+      -
+        name: Get version from package.json
+        id: package-version
+        run: echo "VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_OUTPUT
       -
         name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -28,4 +35,5 @@ jobs:
           tags: |
               4gray/iptvnator:latest
               4gray/iptvnator:${{ github.sha }}
+              4gray/iptvnator:${{ steps.package-version.outputs.VERSION }}
           platforms: linux/amd64,linux/arm64