mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
fix for build step that replaces @grafanaVersion@ with correct version string
This commit is contained in:
parent
87a8b1b3f5
commit
e8c11251de
@ -3,7 +3,7 @@
|
||||
*/
|
||||
require.config({
|
||||
baseUrl: 'app',
|
||||
// urlArgs: 'r=@REV@',
|
||||
|
||||
paths: {
|
||||
config: ['../config', '../config.sample'],
|
||||
settings: 'components/settings',
|
||||
|
@ -11,40 +11,27 @@ module.exports = function(grunt) {
|
||||
'htmlmin:build',
|
||||
'ngtemplates',
|
||||
'cssmin:build',
|
||||
'build:grafanaVersion',
|
||||
'ngmin:build',
|
||||
'requirejs:build',
|
||||
'concat:js',
|
||||
'filerev',
|
||||
'usemin',
|
||||
'clean:temp',
|
||||
'build:write_revision',
|
||||
'uglify:dest'
|
||||
]);
|
||||
|
||||
// run a string replacement on the require config, using the latest revision number as the cache buster
|
||||
grunt.registerTask('build:write_revision', function() {
|
||||
grunt.event.once('git-describe', function (desc) {
|
||||
|
||||
grunt.config('string-replace.config', {
|
||||
files: {
|
||||
'<%= destDir %>/app/components/require.config.js': '<%= destDir %>/app/components/require.config.js',
|
||||
'<%= destDir %>/app/app.js': '<%= destDir %>/app/app.js'
|
||||
},
|
||||
options: {
|
||||
replacements: [
|
||||
{
|
||||
pattern: /@REV@/g,
|
||||
replacement: desc.object
|
||||
},
|
||||
{
|
||||
pattern: /@grafanaVersion@/g,
|
||||
replacement: '<%= pkg.version %>'
|
||||
}
|
||||
]
|
||||
}
|
||||
});
|
||||
grunt.task.run('string-replace:config');
|
||||
grunt.registerTask('build:grafanaVersion', function() {
|
||||
grunt.config('string-replace.config', {
|
||||
files: {
|
||||
'<%= tempDir %>/app/app.js': '<%= tempDir %>/app/app.js'
|
||||
},
|
||||
options: {
|
||||
replacements: [{ pattern: /@grafanaVersion@/g, replacement: '<%= pkg.version %>' }]
|
||||
}
|
||||
});
|
||||
grunt.task.run('git-describe');
|
||||
grunt.task.run('string-replace:config');
|
||||
});
|
||||
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user