highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-04-12 13:49:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

#4642 dont use release branches on RCs (#4656)

Browse Source
This commit is contained in:
/rootzoll 2024-07-23 23:30:11 +02:00 committed by GitHub
parent e7bb32a485
commit cd424ac955
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
home.admin/config.scripts/blitz.fatpack.sh
View File

@ -92,13 +92,20 @@ sudo -u admin curl -H "Accept: application/json; indent=4" https://bitnodes.io/a
# Fallback Nodes List from Bitcoin Core
sudo -u admin curl https://raw.githubusercontent.com/bitcoin/bitcoin/master/contrib/seeds/nodes_main.txt -o /home/admin/fallback.bitcoin.nodes
echo "* Adding Raspiblitz API ..."
sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "blitz-${branch}" || exit 1
echo "* Adding Raspiblitz WebUI ..."
# change back when final release to:
# sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "release/${branch}" || exit 1
sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "master" || exit 1
# use dev branch when its an Release Candidate
source <(/home/admin/_cache.sh get codeVersion)
if [[ "$codeVersion" == *"rc"* ]]; then
echo "# RELEASE CANDIDATE: using development branches for WebUI & API"
echo "* Adding Raspiblitz API ..."
sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "dev" || exit 1
echo "* Adding Raspiblitz WebUI ..."
sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "master" || exit 1
else
echo "* Adding Raspiblitz API ..."
sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "blitz-${branch}" || exit 1
echo "* Adding Raspiblitz WebUI ..."
sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "release/${branch}" || exit 1
fi
# set build code as new www default
sudo rm -r /home/admin/assets/nginx/www_public

10
home.admin/config.scripts/blitz.web.api.sh
View File

@ -178,7 +178,15 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
echo "# activeBranch detected by build_sdcard.sh: ${activeBranch}"
GITHUB_USER="${defaultAPIuser}"
GITHUB_REPO="${defaultAPIrepo}"
GITHUB_BRANCH="blitz-${githubBranch}"
# use dev branch when its an Release Candidate
source <(/home/admin/_cache.sh get codeVersion)
if [[ "$codeVersion" == *"rc"* ]]; then
echo "# RELEASE CANDIDATE: using dev branch"
GITHUB_BRANCH="dev"
else
GITHUB_BRANCH="blitz-${githubBranch}"
fi
GITHUB_COMMITORTAG=""
else
# get parameters

11
home.admin/config.scripts/blitz.web.ui.sh
View File

@ -65,9 +65,14 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
GITHUB_USER="${defaultWEBUIuser}"
GITHUB_REPO="${defaultWEBUIrepo}"
# change back when final release to: GITHUB_BRANCH="release/${githubBranch}"
GITHUB_BRANCH="master"
# use master branch when its an Release Candidate
source <(/home/admin/_cache.sh get codeVersion)
if [[ "$codeVersion" == *"rc"* ]]; then
echo "# RELEASE CANDIDATE: using master branch"
GITHUB_BRANCH="master"
else
GITHUB_BRANCH="release/${githubBranch}"
fi
GITHUB_COMMITORTAG=""
else
# get parameters