Skip to content

ci: lint v5 changes against the PR base branch - #698

Merged
markus-wa merged 1 commit into
v5from
ci/v5-lint-base
Oct 11, 2026
Merged

markus-wa merged 1 commit into
v5from
ci/v5-lint-base

Conversation

@markus-wa

Copy link
Copy Markdown
Owner

scripts/lint-changes.sh defaults to origin/master as baseline. Now that master is v6, every PR against v5 gets linted against master, so reviewdog reports lots of pre-existing issues in untouched files and fails the golangci-lint check (e.g. on #697).

This sets base_rev to the PR's base branch (falling back to v5 for pushes).

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@markus-wa
markus-wa merged commit 3283610 into v5 Oct 11, 2026
6 checks passed
@markus-wa
markus-wa deleted the ci/v5-lint-base branch October 11, 2026 10:50
markus-wa added a commit that referenced this pull request Oct 11, 2026
Brings in encrypted net-message support (#696, #697) and the v5 lint
base fix (#698). Conflict resolution:
- protos & generated .pb.go: take v5's (identical to master's), keep usercmd.proto in generate.sh
- s2_commands.go: master's resolution from a2dd17a (msgCreatorForType + usercmd handling)
- events.go: WarnType order matches master so values are identical on v5 and v6
- ci.yml: keep v5's base_rev for lint-changes

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant