Skip to content

Commit

Permalink
Fix lint and upgrade versions to 1.21/1.22 (#121)
Browse files Browse the repository at this point in the history
Follow-up to #120, I accidentally merged the PR without waiting for all
tests to run, and missed that 1.20 tests are failing.

Lint is failing because of how we skip golangci-lint run in the action
and use the Makefile. Use the same logic as zap to skip lint.

Tests are failing on 1.20 as stack elision doesn't kick in for the test.
From 1.21 onwards, it does kick in. Rather than try to make the test
trigger stack elision on 1.20, let's bump the versions to 1.21 / 1.22.
  • Loading branch information
prashantv committed Apr 13, 2024
1 parent b62053b commit c87aef9
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ["1.20.x", "1.21.x"]
go: ["1.21.x", "1.22.x"]

steps:
- name: Checkout code
Expand All @@ -42,14 +42,16 @@ jobs:
- uses: actions/setup-go@v4
name: Set up Go
with:
go-version: 1.21.x
go-version: 1.22.x
cache: false # managed by golangci-lint

- uses: golangci/golangci-lint-action@v3
name: Install golangci-lint
with:
version: latest
args: --version # make lint will run the linter
# Hack: Use the official action to download, but not run.
# make lint below will handle actually running the linter.
args: --help

- run: make lint
name: Lint

0 comments on commit c87aef9

Please sign in to comment.