From 203bc76cd4bfcd91f5c1b43d64c892954a5f64af Mon Sep 17 00:00:00 2001 From: "cl.st" Date: Mon, 22 Sep 2025 21:00:52 +0200 Subject: [PATCH] feat: tag version handler (#151) --- .env | 3 +-- .github/workflows/generate-apk.yml | 5 ++++- .github/workflows/generate-pr-apk.yml | 3 +++ CHANGELOG.md | 4 ++++ package.json | 1 - src/components/Config/Form.tsx | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 50d8296..db5f7d1 100644 --- a/.env +++ b/.env @@ -1,3 +1,2 @@ GENERATE_SOURCEMAP=false -VITE_REPO_API_URL="/cstaelen/shazarr" -VITE_CURRENT_VERSION="v0.1.4" \ No newline at end of file +VITE_REPO_API_URL="/cstaelen/shazarr" \ No newline at end of file diff --git a/.github/workflows/generate-apk.yml b/.github/workflows/generate-apk.yml index aecc7be..1bee909 100644 --- a/.github/workflows/generate-apk.yml +++ b/.github/workflows/generate-apk.yml @@ -19,6 +19,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set VITE_CURRENT_VERSION + run: echo "VITE_CURRENT_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + - uses: pnpm/action-setup@v4 name: Install pnpm with: @@ -56,7 +59,6 @@ jobs: working-directory: ./android run: chmod +x gradlew - - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 @@ -94,3 +96,4 @@ jobs: android/app/build/outputs/apk/release/shazarr-signed.apk - run: echo Build status report=${{ job.status }} + diff --git a/.github/workflows/generate-pr-apk.yml b/.github/workflows/generate-pr-apk.yml index 1ed2887..bc02ba6 100644 --- a/.github/workflows/generate-pr-apk.yml +++ b/.github/workflows/generate-pr-apk.yml @@ -12,6 +12,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set VITE_CURRENT_VERSION + run: echo "VITE_CURRENT_VERSION=v0.0.0-testing" >> $GITHUB_ENV + - uses: pnpm/action-setup@v4 name: Install pnpm with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8496462..4d27b86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Shazarr notable changes. [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) format. +## 📦 0.1.6 +### 🐛 Changed +* Use github tag as project version + ## 📦 0.1.5 ### 🐛 Fixed * Fix issue with android navigation button overlap in history diff --git a/package.json b/package.json index 01c9879..8e86d5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "shazarr-app", - "version": "0.1.5", "private": true, "engines": { "node": ">=18", diff --git a/src/components/Config/Form.tsx b/src/components/Config/Form.tsx index 9332609..11add61 100644 --- a/src/components/Config/Form.tsx +++ b/src/components/Config/Form.tsx @@ -70,7 +70,7 @@ export default function ConfigForm() { fontSize={12} > Github page -{" "} - {import.meta.env.VITE_STAGE === "testing" + {import.meta.env.VITE_STAGE === "testing" || import.meta.env.MODE === "development" ? "v0.0.0" : import.meta.env.VITE_CURRENT_VERSION}