diff --git a/misc/config_tools/configurator/packages/configurator/src/pages/Config/Scenario/NewScenario.vue b/misc/config_tools/configurator/packages/configurator/src/pages/Config/Scenario/NewScenario.vue index c5f2342b2..0a408dca4 100644 --- a/misc/config_tools/configurator/packages/configurator/src/pages/Config/Scenario/NewScenario.vue +++ b/misc/config_tools/configurator/packages/configurator/src/pages/Config/Scenario/NewScenario.vue @@ -19,7 +19,8 @@

Choose a scenario type: - + Learn about scenarios

@@ -77,6 +78,7 @@ export default { }, data() { return { + version: branchVersion, scenarioTemplate: "shared", preLaunch: 1, postLaunch: 1 diff --git a/misc/config_tools/configurator/packages/configurator/vite.config.js b/misc/config_tools/configurator/packages/configurator/vite.config.js index 8c992bfc7..02b1fe44a 100644 --- a/misc/config_tools/configurator/packages/configurator/vite.config.js +++ b/misc/config_tools/configurator/packages/configurator/vite.config.js @@ -5,9 +5,20 @@ import {defineConfig} from 'vite' import vue from '@vitejs/plugin-vue' import tauri from "./thirdLib/tauri-plugin"; +let versionMatcher = /release_([\d.]+)/; + +let branchVersion = child_process.execSync('git rev-parse --abbrev-ref HEAD').toString() +if (versionMatcher.test(branchVersion)) { + branchVersion = versionMatcher.exec(branchVersion)[1] +} else { + branchVersion = 'latest' +} + const packageVersion = child_process.execSync('git describe --dirty') +console.log('branchVersion: ' + branchVersion) console.log("packageVersion: " + packageVersion) + // https://vitejs.dev/config/ export default defineConfig({ base: './', @@ -19,6 +30,7 @@ export default defineConfig({ outDir: path.resolve(__dirname, 'build') }, define: { - packageVersion: JSON.stringify(packageVersion.toString()) + packageVersion: JSON.stringify(packageVersion.toString()), + branchVersion } })