midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop' into fix/1539

Browse source
This commit is contained in:
Robin van der Linde 2023-08-31 00:33:06 +02:00
commit 966b88d13d
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/deploy_pietervdvn.yml vendored
View file

@ -2,7 +2,6 @@ name: Deployment on pietervdvn
on: on:
push: push:
branches: branches:
- develop
- feature/* - feature/*
- theme/* - theme/*
- refactoring/* - refactoring/*

4
scripts/build.sh
View file

@ -32,7 +32,7 @@ then
echo "Source maps are enabled" echo "Source maps are enabled"
fi fi
if [ $BRANCH = "master" ] if [ $BRANCH = "master" ] || [ $BRANCH = "develop" ]
then then
ASSET_URL="./" ASSET_URL="./"
export ASSET_URL export ASSET_URL
@ -43,7 +43,7 @@ else
echo "$ASSET_URL" echo "$ASSET_URL"
fi fi
export NODE_OPTIONS=--max-old-space-size=6500 export NODE_OPTIONS=--max-old-space-size=32768
vite build $SRC_MAPS vite build $SRC_MAPS