mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 08:55:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source 
# Conflicts:
#	.github/workflows/manual-release.yml
This commit is contained in:
chenos 2024-07-16 15:52:33 +08:00
commit f22632234c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/manual-release.yml vendored
View File

@ -141,7 +141,7 @@ jobs:
git checkout main git checkout main
git pull origin main git pull origin main
git checkout next git checkout next
git merge -X ours main git merge -X ours main --no-edit
git push origin next git push origin next
- name: main -> next - name: main -> next
run: | run: |
@ -149,7 +149,7 @@ jobs:
git checkout main git checkout main
git pull origin main git pull origin main
git checkout next git checkout next
git merge -X ours main git merge -X ours main --no-edit
git push origin next git push origin next
- name: push pro plugins - name: push pro plugins
continue-on-error: true continue-on-error: true