mirror of
https://github.com/StuffAnThings/qbit_manage.git
synced 2025-10-06 20:05:57 +08:00
Merge branch 'develop' into test-ci
This commit is contained in:
commit
acbf0d23af
2 changed files with 4 additions and 1 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
4.5.6-develop16
|
||||
4.5.6-develop17
|
||||
|
|
|
@ -23,6 +23,9 @@ if [[ "$IN_CI" == "true" ]]; then
|
|||
CURRENT_BRANCH_CI="${GITHUB_HEAD_REF:-$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo '')}"
|
||||
if [[ "$CURRENT_BRANCH_CI" == *"develop"* ]]; then
|
||||
BASE_REF="develop"
|
||||
elif grep -q "develop" VERSION 2>/dev/null; then
|
||||
# If VERSION contains "develop" but branch doesn't, still assume base is "develop"
|
||||
BASE_REF="develop"
|
||||
else
|
||||
BASE_REF="$DEFAULT_BASE"
|
||||
fi
|
||||
|
|
Loading…
Add table
Reference in a new issue