diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 36489cf8..74ba2dc4 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 diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml index 076f0eba..4f791e26 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 diff --git a/package-lock.json b/package-lock.json index 8479bd03..8966e690 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 577e5145..a828d580 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 7dd691e4..8fccd6de 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 4d1397eb..40586c5a 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 a5991da3..bfda3678 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",