Redo github actions (#295)

* Redo github actions

Signed-off-by: Steve Coffman <steve@khanacademy.org>

* Update golangci-lint to match gqlgen

Signed-off-by: Steve Coffman <steve@khanacademy.org>

* Linter fixes

Signed-off-by: Steve Coffman <steve@khanacademy.org>

---------

Signed-off-by: Steve Coffman <steve@khanacademy.org>

.github/workflows/lint.yml

@@ -1,46 +1,33 @@
 name: golangci-lint
 on:
+ workflow_dispatch:
  push:
  branches:
- - main
+  - master
  pull_request:
- branches:
- - main
+ types: [ opened, synchronize ]
+# When a new revision is pushed to a PR, cancel all in-progress CI runs for that
+# PR. See https://docs.github.com/en/actions/using-jobs/using-concurrency
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
 env:
  GOFLAGS: "-trimpath"
- GO_VERSION: 1.19
 jobs:
- resolve-modules:
- name: Resolve Modules
- # runs-on: [self-hosted, linux, x64]
- runs-on: ubuntu-latest
- outputs:
- matrix: ${{ steps.set-matrix.outputs.matrix }}
- steps:
- - name: Checkout Sources
- uses: actions/checkout@v2
- - id: set-matrix
- run: ./tools/resolve-modules.sh
- golangci:
- name: Linter
- needs: resolve-modules
- runs-on: ubuntu-latest
+ golangci-lint:
  strategy:
- matrix: ${{ fromJson(needs.resolve-modules.outputs.matrix) }}
+ matrix:
+ go: ["1.21", "1.22"]
+ runs-on: ubuntu-latest
  steps:
- - name: Install Go
-  uses: actions/setup-go@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-go@v5
  with:
- # stable: 'false' # Keep this line to be able to use rc and beta version of Go (ex: 1.18.0-rc1).
- go-version: ${{ env.GO_VERSION }}
- - uses: actions/checkout@v2
- - name: lint
- uses: golangci/golangci-lint-action@v3.2.0
+ go-version: ${{ matrix.go }}
+ - name: golangci-lint
+ uses: golangci/golangci-lint-action@v6.0.1
  with:
  version: latest
- # skip cache because of flaky behaviors
- skip-build-cache: true
- skip-pkg-cache: true
- working-directory: ${{ matrix.workdir }}
- args: --timeout 5m --issues-exit-code=0
+ args: '--timeout 5m'
  # only-new-issues: true #show only new issues if it's a pull request. options working-directory and only-new-issues are incompatible

.github/workflows/manual-go-test.yml → .github/workflows/test.yml

@@ -1,8 +1,11 @@
-name: Manual Go Test Run
-
+name: Test
 on:
  workflow_dispatch:
-
+ push:
+ branches:
+ - master
+ pull_request:
+ types: [ opened, synchronize ]
 # When a new revision is pushed to a PR, cancel all in-progress CI runs for that
 # PR. See https://docs.github.com/en/actions/using-jobs/using-concurrency
 concurrency:
@@ -16,28 +19,20 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- include:
- - os: linux
- run: ubuntu-latest
+ os: [ubuntu-latest]
+ go: ["1.21", "1.22"]
  # MacOS is disabled due to the high cost multiplier on GH Actions.
  #- os: darwin
  # run: macos-latest
  # Windows not allowed currently because of line-ending conversion issues.
  #- os: windows
  # run: windows-latest
+ continue-on-error: true
  steps:
- - name: Check out code
- uses: actions/checkout@v3
-
- - id: go_version
- name: Read go version
- run: echo "::set-output name=go_version::$(cat .go-version)"
-
- - name: Install Go (${{ steps.go_version.outputs.go_version }})
- uses: actions/setup-go@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-go@v5
  with:
- go-version: ${{ steps.go_version.outputs.go_version }}
-
+ go-version: ${{ matrix.go }}
  - name: Unit Test Golang
  run: go test ./...
  timeout-minutes: 30

.golangci.yaml

@@ -1,45 +1,54 @@
 run:
- timeout: 10m
+ tests: true
+
+linters-settings:
+ errcheck:
+ exclude-functions:
+ - (io.Writer).Write
+ - io.Copy
+ - io.WriteString
+ revive:
+ enable-all-rules: false
+ rules:
+ - name: empty-lines
+ testifylint:
+ disable-all: true
+ enable:
+ - bool-compare
+ - compares
+ - error-is-as
+ - error-nil
+ - expected-actual
+ - nil-compare
+
 linters:
  disable-all: true
  enable:
+ - bodyclose
+ - dupl
+ - errcheck
+ - gocritic
+ - gofmt
+ - goimports
+ - gosimple
+ - govet
  - ineffassign
+ - misspell
+ - nakedret
+ - prealloc
+ - revive
+ - staticcheck
+ - testifylint
  - typecheck
- - varcheck
+ - unconvert
  - unused
- - structcheck
- - deadcode
- - gosimple
- - goimports
- - errcheck
- - staticcheck
- - stylecheck
- - gosec
- - asciicheck
- - bodyclose
- - exportloopref
- - rowserrcheck
- - makezero
- - durationcheck
- - prealloc
- - predeclared
 
-linters-settings:
- staticcheck:
- checks: ["S1002","S1004","S1007","S1009","S1010","S1012","S1019","S1020","S1021","S1024","S1030","SA2*","SA3*","SA4009","SA5*","SA6000","SA6001","SA6005", "-SA2002"]
- stylecheck:
- checks: ["-ST1003"]
- gosec:
- severity: "low"
- confidence: "low"
- excludes:
- - G101
- - G112
 issues:
+ exclude-dirs:
+ - bin
  exclude-rules:
+ # Exclude some linters from running on tests files.
  - path: _test\.go
  linters:
+ - dupl
  - errcheck
- - gosec
- - rowserrcheck
- - makezero

ast/argmap_test.go

@@ -32,8 +32,8 @@ func TestArg2Map(t *testing.T) {
  {Name: "A", Value: &Value{Kind: NullValue}},
  {Name: "B", Value: &Value{Kind: NullValue}},
  }, nil)
- require.Equal(t, nil, args["A"])
- require.Equal(t, nil, args["B"])
+ require.Nil(t, args["A"])
+ require.Nil(t, args["B"])
  require.Contains(t, args, "A")
  require.Contains(t, args, "B")
  })
@@ -55,8 +55,8 @@ func TestArg2Map(t *testing.T) {
  "VarA": nil,
  "VarB": nil,
  })
- require.Equal(t, nil, args["A"])
- require.Equal(t, nil, args["B"])
+ require.Nil(t, args["A"])
+ require.Nil(t, args["B"])
  require.Contains(t, args, "A")
  require.Contains(t, args, "B")
  })

ast/decode.go

@@ -11,7 +11,7 @@ func UnmarshalSelectionSet(b []byte) (SelectionSet, error) {
  return nil, err
  }
 
- var result = make([]Selection, 0)
+ result := make([]Selection, 0)
  for _, item := range tmp {
  var field Field
  if err := json.Unmarshal(item, &field); err == nil {

ast/document_test.go

@@ -18,7 +18,7 @@ func TestQueryDocMethods(t *testing.T) {
  }
  `})
 
- require.Nil(t, err)
+ require.NoError(t, err)
  t.Run("GetOperation", func(t *testing.T) {
  require.EqualValues(t, "Bob", doc.Operations.ForName("Bob").Name)
  require.Nil(t, doc.Operations.ForName("Alice"))

ast/path.go

@@ -14,8 +14,10 @@ type PathElement interface {
  isPathElement()
 }
 
-var _ PathElement = PathIndex(0)
-var _ PathElement = PathName("")
+var (
+ _ PathElement = PathIndex(0)
+ _ PathElement = PathName("")
+)
 
 func (path Path) String() string {
  if path == nil {

ast/path_test.go

@@ -57,7 +57,7 @@ func TestPath_MarshalJSON(t *testing.T) {
  for _, spec := range specs {
  t.Run(spec.Value.String(), func(t *testing.T) {
  b, err := json.Marshal(spec.Value)
- require.Nil(t, err)
+ require.NoError(t, err)
 
  require.Equal(t, spec.Expected, string(b))
  })
@@ -88,7 +88,7 @@ func TestPath_UnmarshalJSON(t *testing.T) {
  t.Run(spec.Value, func(t *testing.T) {
  var path Path
  err := json.Unmarshal([]byte(spec.Value), &path)
- require.Nil(t, err)
+ require.NoError(t, err)
 
  require.Equal(t, spec.Expected, path)
  })

formatter/formatter_test.go

@@ -215,7 +215,6 @@ func executeGoldenTesting(t *testing.T, cfg *goldenConfig) {
  t.Fatal(err)
  }
  return
-
  } else if err != nil {
  t.Fatal(err)
  }

gqlerror/error_test.go

@@ -35,7 +35,7 @@ func TestErrorFormatting(t *testing.T) {
  err := ErrorLocf("", 66, 2, "kabloom")
 
  require.Equal(t, `input:66: kabloom`, err.Error())
- require.Equal(t, nil, err.Extensions["file"])
+ require.Nil(t, err.Extensions["file"])
  })
 
  t.Run("with filename", func(t *testing.T) {