Skip to content

Commit

Permalink
Update golangci-lint action to go through all dirs if no working dire…
Browse files Browse the repository at this point in the history
…ctory set
  • Loading branch information
chudilka1 committed Nov 27, 2024
1 parent 959ab5a commit c236c5f
Show file tree
Hide file tree
Showing 6 changed files with 161 additions and 14 deletions.
6 changes: 1 addition & 5 deletions .github/actions/golangci-lint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ runs:
- name: Touching core/web/assets/index.html
shell: bash
run: mkdir -p core/web/assets && touch core/web/assets/index.html
- name: Build binary
working-directory: ${{ inputs.go-directory }}
shell: bash
run: go build ./...
- name: Set golangci-lint working directory
shell: bash
id: set-working-directory
Expand All @@ -59,7 +55,7 @@ runs:
- name: golangci-lint
uses: golangci/golangci-lint-action@38e1018663fa5173f3968ea0777460d3de38f256 # v5.3.0
with:
version: v1.61.0
version: v1.62.2
only-new-issues: true
args: --out-format colored-line-number,checkstyle:golangci-lint-report.xml
working-directory: ${{ steps.set-working-directory.outputs.golangci-lint-working-directory }}
Expand Down
41 changes: 32 additions & 9 deletions .github/workflows/ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
permissions:
pull-requests: read
outputs:
affected-packages: ${{ steps.affected-modules.outputs.changes }}
deployment-changes: ${{ steps.match-some.outputs.deployment == 'true' }}
should-run-ci-core: ${{ steps.match-some.outputs.core-ci == 'true' || steps.match-every.outputs.non-ignored == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
should-run-golangci: ${{ steps.match-some.outputs.golang-ci == 'true' || steps.match-every.outputs.non-ignored == 'true' || github.event_name == 'workflow_dispatch' }}
Expand All @@ -47,7 +48,7 @@ jobs:
with:
# "if any changed file matches one or more of the conditions" (https://github.com/dorny/paths-filter/issues/225)
predicate-quantifier: some
# deployment - any changes to files in `deployments/`
# deployment - any changes to files in the `deployments/`
# core-ci - any changes that could affect this workflow definition
# golang-ci - any changes that could affect the linting result
filters: |
Expand Down Expand Up @@ -75,6 +76,7 @@ jobs:
non-ignored:
- '**'
- '!docs/**'
- '!fuzz/**'
- '!integration-tests/**'
- '!tools/secrets/**'
- '!tools/goreleaser-config/**'
Expand All @@ -91,24 +93,45 @@ jobs:
- '!nix-darwin-shell-hook.sh'
- '!LICENSE'
- '!.github/**'
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
id: affected-modules
with:
# to get affected packages as output (not simply `true` or `false`)
# use the following syntax `package_name: 'path/to/package'`
filters: |
ccip: 'ccip/**'
common: 'common/**'
core: 'core/**'
dashboard-lib: 'dashboard-lib/**'
deployment: 'deployment/**'
plugins: 'plugins/**'
golangci:
# We don't directly merge dependabot PRs, so let's not waste the resources
if: ${{ (github.event_name == 'pull_request' || github.event_name == 'schedule') && github.actor != 'dependabot[bot]' }}
name: lint
# We don't directly merge dependabot PRs, so let's not waste the resources.
# toJson/fromJson is used to account for empty array formatting differences ([], [ ], etc.)
# if: ${{ (github.event_name == 'pull_request' || github.event_name == 'schedule') && github.actor != 'dependabot[bot]' && needs.filter.outputs.should-run-golangci == 'true' && (toJson(fromJson(needs.filter.outputs.affected-packages)) != '[]' && needs.filter.outputs.affected-packages != '')}}
if: always()
needs: [filter, run-frequency]
permissions:
# For golangci-lint-actions to annotate code in the PR.
# To annotate code in the PR.
checks: write
contents: read
# For golangci-lint-action's `only-new-issues` option.
pull-requests: read
runs-on: ubuntu-24.04-8cores-32GB-ARM
needs: [filter, run-frequency]
strategy:
matrix:
fail-fast: false
modules: ${{ fromJson(needs.filter.outputs.affected-packages) }}
steps:
- uses: actions/checkout@v4.2.1
- name: Golang Lint
- name: Checkout
uses: actions/checkout@v4.2.1
- name: Golang Lint (${{ matrix.modules }})
uses: ./.github/actions/golangci-lint
if: ${{ needs.filter.outputs.should-run-golangci == 'true' }}
with:
# The prefix `./` is needed because of unprefixed module names
go-directory: ./${{ matrix.modules }}
- name: Notify Slack
if: ${{ failure() && needs.run-frequency.outputs.one-per-day-frequency == 'true' }}
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
Expand Down
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
run:
timeout: 15m0s
allow-parallel-runners: true
allow-serial-runners: true
linters:
enable:
- containedctx
Expand Down
42 changes: 42 additions & 0 deletions ccip/fail_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package ccip

import (
"sync"
"testing"
)

func TestFail(t *testing.T) {
if testing.Short() {
t.Skip()
}
t.Fatal("fake failure")
}

func TestRace(t *testing.T) {
var v int
var wg sync.WaitGroup
wg.Add(100)
for i := 0; i < 100; i++ {
go func() {
defer wg.Done()
v++
v--
}()
}
wg.Wait()
t.Log(v)
}

// func TestLint(t *testing.T) {
// const v1 = (true && false) && (true && false) // SQ Identical expressions should not be used on both sides of a binary operator
// a := 1
// if !(a == 2) { // SQ boolean check should not be inverted
// }
// const UnusedVar = 1 // lint should complain for unused variable
// const ALL_CAPS = 10 // should be AllCaps
// err := os.ErrNotExist
// if err == os.ErrNotExist { // should use errors.Is
// err := errors.New("fake error") // shadowed variable
// t.Log(err)
// }
// }
42 changes: 42 additions & 0 deletions core/fail_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package core

import (
"sync"
"testing"
)

func TestFail(t *testing.T) {
if testing.Short() {
t.Skip()
}
t.Fatal("fake failure")
}

func TestRace(t *testing.T) {
var v int
var wg sync.WaitGroup
wg.Add(100)
for i := 0; i < 100; i++ {
go func() {
defer wg.Done()
v++
v--
}()
}
wg.Wait()
t.Log(v)
}

// func TestLint(t *testing.T) {
// const v1 = (true && false) && (true && false) // SQ Identical expressions should not be used on both sides of a binary operator
// a := 1
// if !(a == 2) { // SQ boolean check should not be inverted
// }
// const UnusedVar = 1 // lint should complain for unused variable
// const ALL_CAPS = 10 // should be AllCaps
// err := os.ErrNotExist
// if err == os.ErrNotExist { // should use errors.Is
// err := errors.New("fake error") // shadowed variable
// t.Log(err)
// }
// }
42 changes: 42 additions & 0 deletions dashboard-lib/fail_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package dashboard_lib

import (
"sync"
"testing"
)

func TestFail(t *testing.T) {
if testing.Short() {
t.Skip()
}
t.Fatal("fake failure")
}

func TestRace(t *testing.T) {
var v int
var wg sync.WaitGroup
wg.Add(100)
for i := 0; i < 100; i++ {
go func() {
defer wg.Done()
v++
v--
}()
}
wg.Wait()
t.Log(v)
}

// func TestLint(t *testing.T) {
// const v1 = (true && false) && (true && false) // SQ Identical expressions should not be used on both sides of a binary operator
// a := 1
// if !(a == 2) { // SQ boolean check should not be inverted
// }
// const UnusedVar = 1 // lint should complain for unused variable
// const ALL_CAPS = 10 // should be AllCaps
// err := os.ErrNotExist
// if err == os.ErrNotExist { // should use errors.Is
// err := errors.New("fake error") // shadowed variable
// t.Log(err)
// }
// }

0 comments on commit c236c5f

Please sign in to comment.