logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 6e5c7bf308ddcb2be756cb84c6c7119b612e4e28
parent 1d679b59a07444e18f24167cb7e8563c5e385d9f
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sun, 10 Sep 2023 08:22:28 +0200

Use export-subst gitattribute to allow tarball builds

For example it would do the following:

    let subst = "d3bf557c";

Diffstat:

A.gitattributes1+
Mbuild/webpack.prod.conf.js13++++++++++---
Achangelog.d/export-subst-hash.fix1+
3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes @@ -0,0 +1 @@ +/build/webpack.prod.conf.js export-subst diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js @@ -11,9 +11,16 @@ var env = process.env.NODE_ENV === 'testing' ? require('../config/test.env') : config.build.env -let commitHash = require('child_process') - .execSync('git rev-parse --short HEAD') - .toString(); +let commitHash = (() => { + let subst = "$Format:%h$"; + if(!subst.match(/Format:/)) { + return subst; + } else { + return require('child_process') + .execSync('git rev-parse --short HEAD') + .toString(); + } +})(); var webpackConfig = merge(baseWebpackConfig, { mode: 'production', diff --git a/changelog.d/export-subst-hash.fix b/changelog.d/export-subst-hash.fix @@ -0,0 +1 @@ +Use export-subst gitattribute to allow tarball builds