Merge branch 'development' of https://github.com/plebbit/plebchan into development

This commit is contained in:
Tom
2023-05-25 08:15:15 +02:00
4 changed files with 9 additions and 3 deletions
+1
View File
@@ -0,0 +1 @@
REACT_APP_COMMIT_REF=$COMMIT_REF
+3
View File
@@ -1,3 +1,6 @@
# scripts/deploy.sh env
.deploy-env
# electron builder binaries # electron builder binaries
/bin /bin
+2 -2
View File
@@ -6,8 +6,8 @@
cd "$(dirname "$0")" cd "$(dirname "$0")"
# add env vars # add env vars
if [ -f ../.env ]; then if [ -f ../.deploy-env ]; then
export $(echo $(cat ../.env | sed 's/#.*//g'| xargs) | envsubst) export $(echo $(cat ../.deploy-env | sed 's/#.*//g'| xargs) | envsubst)
fi fi
# check creds # check creds
+3 -1
View File
@@ -9,6 +9,8 @@ import OfflineIndicator from '../OfflineIndicator';
import packageJson from '../../../package.json' import packageJson from '../../../package.json'
import { Tooltip } from 'react-tooltip'; import { Tooltip } from 'react-tooltip';
const {version} = packageJson const {version} = packageJson
// show commit ref on netlify to know which commit is being served for debugging
const commitRef = process?.env?.REACT_APP_COMMIT_REF ? ` ${process.env.REACT_APP_COMMIT_REF.slice(0, 7)}` : ''
const Home = () => { const Home = () => {
@@ -184,7 +186,7 @@ const Home = () => {
fontSize: "11px", fontSize: "11px",
marginBottom: "2em", marginBottom: "2em",
}}> }}>
plebchan v{version}. GPL-2.0 plebchan v{version}{commitRef}. GPL-2.0
</div> </div>
</Container> </Container>
</> </>