1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

chore(CI): Revert 40989e54d8

Workaround was only due to a travis limitation that's no longer present on GH actions.
This commit is contained in:
Anthony Bilinski 2022-02-16 08:10:48 -08:00
parent 75648d04b9
commit 17c4ad4ba7
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C

View File

@ -36,10 +36,11 @@ ARG="$1"
echo "" # ← formatting echo "" # ← formatting
grep_for_invalid() { grep_for_invalid() {
# we can't rely on differentiating merge and normal commits since short clones that travis does may not be able # differentiate what is allowed for commit messages and merge messages
# to tell if the oldest commit is a merge commit or not git log --no-merges --format=format:'%s' "$ARG" \
git log --format=format:'%s' "$ARG" \ | grep -v -E '^(feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.{,12}\))?:.{1,68}$' \
| grep -v -E '^((feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.{,12}\))?:.{1,68})|(Merge .{1,70})$' || git log --merges --format=format:'%s' "$ARG" \
| grep -v -E '^Merge .{1,70}$'
} }
# Conform, /OR ELSE/. # Conform, /OR ELSE/.