From d70254bcdc3a3d885452e8e8b9c4d8f6961b3484 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Thu, 20 Jun 2024 09:17:28 -0700 Subject: [PATCH] Generic build version --- .eslintrc.cjs | 2 +- .github/workflows/release.yml | 4 ++++ package.json | 3 ++- scripts/replace-version.cjs | 9 +++++++++ src-tauri/tauri.conf.json | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 scripts/replace-version.cjs diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 06c44947..612c435f 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -12,7 +12,7 @@ module.exports = { parserOptions: { project: ["./tsconfig.json"] }, - ignorePatterns: ["src-tauri/**/*", "plugins/**/*"], + ignorePatterns: ["scripts/**/*", "src-tauri/**/*", "plugins/**/*"], settings: { react: { version: "detect" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6afb635e..4f8066d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,6 +54,10 @@ jobs: run: npm run lint - name: Run tests run: npm test + - name: Set version + run: npm run replace-version + env: + YAAK_VERSION: ${{ github.ref_name }} - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 8ed2cafe..0fc171ae 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "build:plugin:filter-xpath": "cd plugins/filter-xpath && vite build --emptyOutDir", "test": "vitest", "coverage": "vitest run --coverage", - "prepare": "husky install" + "prepare": "husky install", + "replace-version": "node ./scripts/replace-version.cjs" }, "dependencies": { "@codemirror/commands": "^6.2.1", diff --git a/scripts/replace-version.cjs b/scripts/replace-version.cjs new file mode 100644 index 00000000..dbd9b5f1 --- /dev/null +++ b/scripts/replace-version.cjs @@ -0,0 +1,9 @@ +const path = require('path'); +const fs = require('fs'); + +const tauriConfig = fs.readFileSync(path.join(__dirname, '../src-tauri/tauri.conf.json'), 'utf8'); +if (!process.env.YAAK_VERSION) { + throw new Error('YAAK_VERSION environment variable not set') +} + +console.log(tauriConfig.replaceAll('__YAAK_VERSION__', process.env.YAAK_VERSION.replace('v', ''))); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 1f38cb88..e81fe862 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,6 +1,6 @@ { "productName": "yaak", - "version": "2024.7.0-beta.2", + "version": "__YAAK_VERSION__", "identifier": "app.yaak.desktop", "build": { "beforeBuildCommand": "npm run build",