mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 13:39:24 +08:00
Merge branch 'main' into next
This commit is contained in:
commit
1b79dc89a6
2
.github/workflows/auto-merge.yml
vendored
2
.github/workflows/auto-merge.yml
vendored
@ -35,7 +35,7 @@ jobs:
|
||||
echo "targetBranch=$(echo 'next')" >> $GITHUB_OUTPUT
|
||||
elif [[ "${{ inputs.branch || github.head_ref || github.ref_name }}" == "next" ]]; then
|
||||
echo "baseBranch=$(echo 'next')" >> $GITHUB_OUTPUT
|
||||
echo "target=$(echo 'develop')" >> $GITHUB_OUTPUT
|
||||
echo "targetBranch=$(echo 'develop')" >> $GITHUB_OUTPUT
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user