Skip to content

Commit afd10d8

Browse files
authored
Merge pull request #533 from Luap99/merge-back
Merge tag 'common/v0.66.1' into main
2 parents fb1cbee + f250115 commit afd10d8

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/validate.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ jobs:
7171
if: github.event_name == 'pull_request'
7272
runs-on: ubuntu-24.04
7373
env:
74-
GIT_CHECK_EXCLUDE: "./vendor"
74+
# Base commit sha that we use the lint the commit from
75+
EPOCH_TEST_COMMIT: "${{ github.event.pull_request.base.sha }}"
7576
steps:
7677
- uses: actions/checkout@v6
7778
with:
@@ -85,10 +86,7 @@ jobs:
8586
# See comment on lint task
8687
cache-dependency-path: "**/go.sum"
8788
- name: run git-validation
88-
89-
# We validate all commits as we only fetched the number of commits in the PR above,
90-
# by default git-validation has some special github action handling but that seems broken.
91-
run: make .install.gitvalidation && git-validation -no-github
89+
run: make .install.gitvalidation && make git-validation
9290

9391
go-vendor:
9492
runs-on: ubuntu-24.04

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ install.tools: .install.gitvalidation .install.golangci-lint .install.md2man
4141

4242
.PHONY: git-validation
4343
git-validation: .install.gitvalidation
44-
GIT_CHECK_EXCLUDE="./vendor" git-validation -q -run DCO,short-subject,dangling-whitespace -range "$(EPOCH_TEST_COMMIT)..HEAD"
44+
ifndef EPOCH_TEST_COMMIT
45+
$(error EPOCH_TEST_COMMIT is empty)
46+
endif
47+
GIT_CHECK_EXCLUDE="./vendor" git-validation $(if $(CI),,-q) -run DCO,short-subject,dangling-whitespace -range "$(EPOCH_TEST_COMMIT)..HEAD"
4548

4649
.PHONY: lint
4750
lint: .install.golangci-lint

0 commit comments

Comments
 (0)