Staging deploy adjustments

build.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# the version number is just a unix timestamp in minutes
+versionCode=$1
+
 source ~/.nvm/nvm.sh;
 
 nvm install v21
@@ -21,8 +24,6 @@ set -e
 set -x
 
 
-# the version number is just a unix timestamp in minutes
-versionCode=$(($(date +%s) / 60))
 
 
 # Replace the version code and name in gradle for fdroid and play store
@@ -48,9 +49,3 @@ npm run build
 rm -rf ./app/src/main/assets/*
 cp public/* dist
 cp dist/* ./app/src/main/assets/
-
-# Create a release commit and tag
-git add .
-git commit -m "Build $versionCode"
-git tag -a $versionCode -m $versionCode
-git push

deploy.sh

@@ -1,6 +1,14 @@
 #!/bin/bash
 
-bash ./build.sh
+versionCode=$(($(date +%s) / 60))
+
+bash ./build.sh $versionCode
+
+# Create a release commit and tag
+git add .
+git commit -m "Build $versionCode"
+git tag -a $versionCode -m $versionCode
+git push
 
 # upload to breakout.lecaro.me
 DOMAIN="breakout.lecaro.me"
@@ -12,3 +20,4 @@ rsync -avz --delete --delete-excluded --exclude="*.sh" --exclude="node_modules"
 # upload to itch.io , upload the index file directly
 butler push "./dist/index.html" renanlecaro/breakout71:latest --userversion $versionCode
 butler push  "./dist/index.html" renanlecaro/breakout71:offline --userversion $versionCode
+

deploy_staging.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-bash ./build.sh
+versionCode=$(($(date +%s) / 60))
+
+bash ./build.sh $versionCode
+
+# we don't add a version tag to let fdroid ignore this build
 
 # upload to breakout-v3-staging.lecaro.me
 DOMAIN="breakout-v3-staging.lecaro.me"
@@ -9,5 +13,3 @@ PUBLIC_CONTENT="./dist/*"
 ssh staging "mkdir -p /opt/mup-nginx-proxy/config/html/static_sites/$DOMAIN"
 rsync -avz --delete  $PUBLIC_CONTENT staging:/opt/mup-nginx-proxy/config/html/static_sites/$DOMAIN
 
-# upload to itch.io , upload the index file directly
-butler push "./dist/index.html" renanlecaro/breakout71:nightly --userversion $versionCode