Skip to content

Commit

Permalink
Merge pull request #14 from rndquu/ci/sync-dev-ci
Browse files Browse the repository at this point in the history
feat: added autosync for development and the new development-ci
  • Loading branch information
rndquu committed Jun 23, 2023
2 parents ad8e02c + bb40350 commit 8cd0ad7
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/development-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Development to Development-CI Sync

on:
push:
branches:
- development

permissions:
contents: write

jobs:
sync:
runs-on: ubuntu-latest
name: Sync changes from development to development-ci

steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Run merge
run: |
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git checkout development-ci
echo "debug information"
git status
git branch -avv
git log --graph --pretty=oneline --abbrev-commit --all -20
echo "git diff"
git diff development
echo "== merging =="
(git merge development\
&& git push\
&& echo "successfully rebased features to development-ci")\
|| (echo "cannot automatically sync due to merge conflicts" && exit 1)

0 comments on commit 8cd0ad7

Please sign in to comment.