From bb403509613fbd1da4385b3e414f11669e92a25a Mon Sep 17 00:00:00 2001 From: me505 <75jainmukesh@gmail.com> Date: Mon, 19 Jun 2023 16:47:17 +0530 Subject: [PATCH] feat: added autosync for development and the new development-ci --- .github/workflows/development-ci.yml | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/development-ci.yml diff --git a/.github/workflows/development-ci.yml b/.github/workflows/development-ci.yml new file mode 100644 index 000000000..b00ef2a0f --- /dev/null +++ b/.github/workflows/development-ci.yml @@ -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)