Skip to content

Commit

Permalink
Merge onto solution branch automatically
Browse files Browse the repository at this point in the history
  • Loading branch information
turion authored and Manuel Bärenz committed Jan 5, 2024
1 parent 8232f45 commit c1897ed
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,16 @@ jobs:
- name: Cabal build dependencies
run: cabal build all --enable-tests --only-dependencies

- name: Check whether solution branch only contains diffs in the Koans
- name: Check whether solution branch only contains diffs in the Koans, and merge
run: |
git fetch origin main
git fetch origin solution
git checkout solution
git config --global user.name 'Manuel Bärenz'
git config --global user.email '[email protected]'
git merge origin/main
git diff origin/solution --exit-code -- ':(exclude)koans/**/Koan.hs'
git push
- name: Check out solution branch
uses: actions/checkout@v4
Expand Down

0 comments on commit c1897ed

Please sign in to comment.