Commit 420d4a9 1 parent 733aed1 commit 420d4a9 Copy full SHA for 420d4a9
File tree 3 files changed +9
-4
lines changed
3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 7
7
runs-on : ubuntu-18.04
8
8
9
9
steps :
10
+ - uses : actions/checkout@master
10
11
- name : Block Fixup Merge
11
12
uses : 13rac1/block-fixup-merge-action@master
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ FROM alpine:3.10
2
2
3
3
RUN apk add --no-cache \
4
4
bash \
5
- jq
5
+ git
6
6
COPY entrypoint.sh /entrypoint.sh
7
7
8
8
CMD ["/entrypoint.sh" ]
Original file line number Diff line number Diff line change 2
2
set -e
3
3
set -o pipefail
4
4
main () {
5
- echo " Current branch: ${GITHUB_REF} "
5
+ echo " Current ref: ${GITHUB_REF} "
6
+ echo " Current branch: ${GITHUB_REF: 11} "
7
+ # Using git directly because the $GITHUB_EVENT_PATH file only shows commits in
8
+ # most recent push.
6
9
7
- FIXUP_COUNT=` jq .commits[].message ${GITHUB_EVENT_PATH } | grep fixup! | wc -l || true`
10
+ FIXUP_COUNT=` git log --pretty=format:%s origin/master..origin/ ${GITHUB_REF : 11 } | grep fixup! | wc -l || true`
8
11
echo " Fixup! commits: ${FIXUP_COUNT} "
9
12
if [ " $FIXUP_COUNT " -gt " 0" ]; then
10
- echo " Found Fixup! commits, failing"
13
+ git log --pretty=format:%s origin/master..origin/${GITHUB_REF: 11} | grep fixup!
14
+ echo " failing..."
11
15
exit 1
12
16
fi
13
17
}
You can’t perform that action at this time.
0 commit comments