ourworld_web/www_mycelium
23
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ourworld_web:c5401d6abd6d8f70feb60b3acb11a4a21cc84729
Branches Tags
ourworld_web:development ourworld_web:master ourworld_web:development_markdown ourworld_web:archive
...
compare: ourworld_web:development
Branches Tags
ourworld_web:development ourworld_web:master ourworld_web:development_markdown ourworld_web:archive

3 Commits
c5401d6abd ... developmen

Author SHA1 Message Date
sasha-astiadi
8ee7e4d58b ok 2025-09-02 13:53:28 +02:00
sasha-astiadi
17ff2a8651 Complete merge: resolve conflicts with branch-aware deployment solution 2025-09-02 13:26:16 +02:00
sasha-astiadi
f2fa57e7bb Implement branch-aware deployment: auto-detect environment to prevent merge conflicts 
- Auto-detects git branch (master/development/other)
- Sets correct base_url for each environment:
  * master -> https://www.mycelium.threefold.io/ (production)
  * development -> https://www2.mycelium.threefold.io/ (staging)
  * other -> /mycelium/ (local development)
- Eliminates merge conflicts between staging and production
- Enables seamless branch merging workflow
 2025-09-02 13:24:15 +02:00
1 changed files with 24 additions and 8 deletions
Expand all files Collapse all files

32
build.sh
View File

@@ -43,13 +43,29 @@ echo "Compiling tailwindcss and building zola project..."
rm -rf public static/css
./tailwindcss -i css/index.css -o ./static/css/index.css --minify
# Auto-detect deployment environment based on git branch
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo "Detected git branch: $CURRENT_BRANCH"
echo "Building for staging deployment..."
sed 's|base_url = "BASEURL"|base_url = "https://www2.mycelium.threefold.io/"|' config.templ.toml > config.toml
if [ "$CURRENT_BRANCH" = "master" ]; then
# Production deployment (www.mycelium.threefold.io)
echo "Building for PRODUCTION environment..."
BASE_URL="https://www.mycelium.threefold.io/"
DEPLOY_PATH="root@threefold.info:/root/hero/www/info/$PREFIX/"
elif [ "$CURRENT_BRANCH" = "development" ]; then
# Staging deployment (www2.mycelium.threefold.io)
echo "Building for STAGING environment..."
BASE_URL="https://www2.mycelium.threefold.io/"
DEPLOY_PATH="root@threefold.info:/root/hero/www/info/$PREFIX/"
else
# Fallback for other branches (local development mode)
echo "Building for LOCAL/OTHER branch environment..."
BASE_URL="/mycelium/"
DEPLOY_PATH="${HOME}/hero/var/www/$PREFIX/"
fi
echo "Using base_url: $BASE_URL"
sed "s|base_url = \"BASEURL\"|base_url = \"$BASE_URL\"|" config.templ.toml > config.toml
zola --root $ABS_DIR_OF_SCRIPT build
rsync -avz --delete public/ "root@threefold.info:/root/hero/www/info/$PREFIX/"
# echo "Building with prefix: /$PREFIX/"
# sed 's|base_url = "BASEURL"|base_url = "/mycelium/"|' config.templ.toml > config.toml
# zola --root $ABS_DIR_OF_SCRIPT build
# rsync -rav --delete public/ "${HOME}/hero/var/www/$PREFIX/"
echo "Build completed. Site available in 'public/' directory."
# Deployment removed: rsync -avz --delete public/ "$DEPLOY_PATH"