Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Direct sync merge #502

Closed
wants to merge 5 commits into from
Closed

Direct sync merge #502

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f90c9b5
Direct merge after sync
violet-dev Sep 8, 2024
53707b9
TEST
violet-dev Sep 8, 2024
2d5b03f
TEST
violet-dev Sep 8, 2024
7e281cd
TEST
violet-dev Sep 8, 2024
0af3f73
TEST
violet-dev Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions .github/workflows/violet-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
schedule:
- cron: "0 0 */1 * *"
workflow_dispatch:
pull_request:

jobs:
sync-job:
Expand Down Expand Up @@ -50,24 +51,20 @@ jobs:
#
# Update
#
- name: Today
id: ciinfo
if: always()
run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
- name: Revision
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git checkout -b sync
git config --local user.email "[email protected]"
git config --local user.name "violet-dev-bot"
git config --global pull.rebase false
git add assets/daily.zip
git commit -m "Daily Sync"
git push --set-upstream origin sync --force

#
# PR Creation
#
- name: Today
id: ciinfo
if: always()
run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
- name: Create Pull Request
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh pr create -B dev -H sync --title 'Daily Sync (${{ steps.ciinfo.outputs.today }})' --body 'Daily sync data'
git commit -m "Daily Sync (${{ steps.ciinfo.outputs.today }})"
git checkout dev
git merge sync
git push -f
Loading