fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2024-11-18 14:55:50 +00:00
commit 1b79dc89a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/auto-merge.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
echo "targetBranch=$(echo 'next')" >> $GITHUB_OUTPUT echo "targetBranch=$(echo 'next')" >> $GITHUB_OUTPUT
elif [[ "${{ inputs.branch || github.head_ref || github.ref_name }}" == "next" ]]; then elif [[ "${{ inputs.branch || github.head_ref || github.ref_name }}" == "next" ]]; then
echo "baseBranch=$(echo 'next')" >> $GITHUB_OUTPUT echo "baseBranch=$(echo 'next')" >> $GITHUB_OUTPUT
echo "target=$(echo 'develop')" >> $GITHUB_OUTPUT echo "targetBranch=$(echo 'develop')" >> $GITHUB_OUTPUT
else else
exit 1 exit 1
fi fi