-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Don't merge and push to solution branch
- Loading branch information
Manuel Bärenz
committed
Jan 5, 2024
1 parent
c1897ed
commit 32c8699
Showing
1 changed file
with
1 addition
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -103,16 +103,12 @@ jobs: | |
- name: Cabal build dependencies | ||
run: cabal build all --enable-tests --only-dependencies | ||
|
||
- name: Check whether solution branch only contains diffs in the Koans, and merge | ||
- name: Check whether solution branch only contains diffs in the Koans | ||
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 | ||
|