Skip to content

Commit

Permalink
Update sync_with_terminal_wiki.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
charanravi-online authored Apr 26, 2024
1 parent dc604bd commit 1f28a15
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/sync_with_terminal_wiki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Sync with terminal-wiki

on:
schedule:
- cron: '0 * * * *'
- cron: '0 * * * *'
workflow_dispatch:

jobs:
Expand All @@ -24,5 +24,13 @@ jobs:
run: |
git remote add upstream https://github.com/charanravi-online/terminal-wiki.git || true
git fetch upstream
git merge upstream/main --allow-unrelated-histories -m "Merging changes from terminal-wiki"
- name: Merge changes excluding README and LICENSE
run: |
git merge upstream/main --no-commit --no-ff
git checkout --ours README.md LICENSE
git commit -m "Merge changes from terminal-wiki excluding README and LICENSE"
- name: Push changes
run: |
git push origin main

0 comments on commit 1f28a15

Please sign in to comment.