Fix

.github/workflows/check-generated.yml

@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
       - uses: actions/checkout@v4
         with:

.github/workflows/lint.yml

@@ -1,37 +1,36 @@
-name: Golang Linter
-# Lint runs golangci-lint over the entire CometBFT repository.
+name: Lint, format and check the code for typos
+# Lint runs `make lint`
 #
-# This workflow is run on every pull request and push to v0.38.x.
-#
-# The `golangci` job will pass without running if no *.{go, mod, sum}
-# files have been modified.
+# This workflow is run on every pull request and push to main.
 #
 # To run this locally, simply run `make lint` from the root of the repo.
 
 on:
   pull_request:
+  merge_group:
   push:
     branches:
-      - v0.38.x
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
-  golangci:
-    name: golangci-lint
+  lint:
+    name: lint
     runs-on: ubuntu-latest
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '1.21'
-      - uses: technote-space/get-diff-action@v6
+      - uses: actions/setup-python@v5
         with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - uses: golangci/golangci-lint-action@v3
+          python-version: '3.x'
+
+      - run: echo "GO_VERSION=$(cat .github/workflows/go-version.env | grep GO_VERSION | cut -d '=' -f2)" >> $GITHUB_ENV
+
+      - uses: actions/setup-go@v5
         with:
-          version: latest
-          args: --timeout 10m
-          github-token: ${{ secrets.github_token }}
-        if: env.GIT_DIFF
+          go-version: ${{ env.GO_VERSION }}
+
+      - uses: pre-commit/[email protected]