moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'export-subst-hash' into 'develop' 

Use export-subst gitattribute to allow tarball builds

See merge request pleroma/pleroma-fe!1854
This commit is contained in:
tusooa 2023-10-04 09:31:14 +00:00
parent 1d679b59a0 c05b1b9072
commit d356841441
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
/build/webpack.prod.conf.js export-subst

9
build/webpack.prod.conf.js
View File

@ -11,9 +11,16 @@ var env = process.env.NODE_ENV === 'testing'
? require('../config/test.env') ? require('../config/test.env')
: config.build.env : config.build.env
let commitHash = require('child_process') let commitHash = (() => {
const subst = "$Format:%h$";
if(!subst.match(/Format:/)) {
return subst;
} else {
return require('child_process')
.execSync('git rev-parse --short HEAD') .execSync('git rev-parse --short HEAD')
.toString(); .toString();
}
})();
var webpackConfig = merge(baseWebpackConfig, { var webpackConfig = merge(baseWebpackConfig, {
mode: 'production', mode: 'production',

1
changelog.d/export-subst-hash.fix Normal file
View File

@ -0,0 +1 @@
Use export-subst gitattribute to allow tarball builds