From 74f72c15b38e74074a26eac4926c4bca3e5bf6a7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 2 Aug 2021 14:48:19 -0400 Subject: [PATCH] dev: fix commit linter target and lint all commits - Was formerly processing the internal merge commit, which never conforms to our conventions, but is also unrelated to the work at hand. - Now lints the range of commits applicable to the event, and not just the latest commit. --- .github/workflows/lint.yml | 2 +- core/cli/ci.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ba789c54c..ec42e694f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,4 +11,4 @@ jobs: - uses: actions/checkout@v2.3.1 with: fetch-depth: 0 - - run: bin/doom ci lint-commits HEAD~1 + - run: bin/doom ci lint-commits ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} diff --git a/core/cli/ci.el b/core/cli/ci.el index a0bab42d2..516f3dd49 100644 --- a/core/cli/ci.el +++ b/core/cli/ci.el @@ -144,7 +144,7 @@ (insert (cdr (doom-call-process "git" "log" - (format "%s...%s" from (or to "HEAD"))))) + (format "%s..%s" from (or to "HEAD"))))) (while (re-search-backward "^commit \\([a-z0-9]\\{40\\}\\)" nil t) (push (cons (match-string 1) (replace-regexp-in-string