From 3c3c09a523cc8b782f719b3d234120523f22488c Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 6 Jul 2023 13:56:05 -0400 Subject: [PATCH] set version at build time --- app/forge.config.ts | 5 +++++ app/package.json | 2 +- web/package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/forge.config.ts b/app/forge.config.ts index 34aa69c7..08392dec 100644 --- a/app/forge.config.ts +++ b/app/forge.config.ts @@ -6,12 +6,17 @@ import { MakerRpm } from '@electron-forge/maker-rpm' import { PublisherGithub } from '@electron-forge/publisher-github' import { AutoUnpackNativesPlugin } from '@electron-forge/plugin-auto-unpack-natives' import { WebpackPlugin } from '@electron-forge/plugin-webpack' +import * as path from 'path' +import * as fs from 'fs' import { mainConfig } from './webpack.main.config' import { rendererConfig } from './webpack.renderer.config' +const packageJson = JSON.parse(fs.readFileSync(path.resolve(__dirname, './package.json'), 'utf8')) + const config: ForgeConfig = { packagerConfig: { + appVersion: process.env.VERSION || packageJson.version, asar: true, icon: './images/icon', extraResource: ['../ollama', '../ggml-metal.metal'], diff --git a/app/package.json b/app/package.json index 7fbb8260..36746e8c 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "ollama", "productName": "Ollama", - "version": "0.0.2", + "version": "0.0.0", "description": "ollama", "main": ".webpack/main", "scripts": { diff --git a/web/package.json b/web/package.json index 63fc888c..4da5924d 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "web", - "version": "0.1.0", + "version": "0.0.0", "scripts": { "dev": "next dev", "build": "next build",