Merge pull request #386 from doug-martin/upgrade-dependencies

Upgrade dependencies
doug-martin · Dec 14, 2023 · 035d999 · 035d999
2 parents 7ff091d + 730cff9
commit 035d999
Show file tree

Hide file tree

Showing 278 changed files with 70,047 additions and 35,579 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -11,25 +11,28 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_version: ["1.15", "1.16", "latest"]
+        go_version: ["1.19", "latest"]
         db_versions:
-          - mysql_version: 5
-            postgres_version: 9.6
-            sqlserver_version: "2017-CU8-ubuntu"
-          - mysql_version: 5
-            postgres_version: "10.10"
-            sqlserver_version: "2017-CU8-ubuntu"
+          - mysql_version: 5.7
+            postgres_version: 9
+            sqlserver_version: "2017-latest"
+          - mysql_version: "8.0"
+            postgres_version: 10
+            sqlserver_version: "2019-latest"
           - mysql_version: 8
-            postgres_version: 11.5
-            sqlserver_version: "2017-CU8-ubuntu"
+            postgres_version: 11
+            sqlserver_version: "2022-latest"
+          - mysql_version: 8
+            postgres_version: 15
+            sqlserver_version: "2022-latest"
     env:
       GO_VERSION: ${{ matrix.go_version }}
       MYSQL_VERSION: ${{ matrix.db_versions.mysql_version }}
       POSTGRES_VERSION: ${{ matrix.db_versions.postgres_version }}
       SQLSERVER_VERSION: ${{ matrix.db_versions.sqlserver_version }}
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Test
       run: docker-compose run goqu-coverage
     - name: Upload coverage to Codecov

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -12,19 +12,23 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+          cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.39.0
+          version: latest
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
           # args: --issues-exit-code=0
-
+          args: --timeout 3m0s
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -25,8 +25,6 @@ linters-settings:
     min-complexity: 20
   goimports:
     local-prefixes: github.com/golangci/golangci-lint
-  golint:
-    min-confidence: 0
   gomnd:
     settings:
       mnd:
@@ -48,7 +46,6 @@ linters-settings:
   misspell:
     locale: US
   nolintlint:
-    allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
     allow-unused: false # report any unused nolint directives
     require-explanation: false # don't require an explanation for nolint directives
     require-specific: false # don't require nolint directives to be specific about which linter is being skipped
@@ -62,8 +59,6 @@ linters:
   enable:
     - asciicheck
     - bodyclose
-    - deadcode
-    - depguard
     - dogsled
     - errcheck
     - exportloopref
@@ -72,19 +67,16 @@ linters:
     - errorlint
     - funlen
     - forbidigo
-    - forcetypeassert
     - goconst
     - gocritic
     - gocyclo
     - gofmt
     - goimports
-    - golint
     - gomnd
     - goprintffuncname
     - gosec
     - gosimple
     - govet
-    - ifshort
     - ineffassign
     - lll
     - makezero
@@ -95,16 +87,15 @@ linters:
     - nolintlint
     - prealloc
     - predeclared
+    - revive
     - rowserrcheck
     - staticcheck
-    - structcheck
     - stylecheck
     - testpackage
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
 
   # don't enable:

diff --git a/Makefile b/Makefile
@@ -3,4 +3,4 @@
 phony:
 
 lint:
-	docker run --rm -v ${CURDIR}:/app -w /app golangci/golangci-lint:v1.23.8 golangci-lint run -v
+	docker run --rm -v ${CURDIR}:/app -w /app golangci/golangci-lint:v1.53.3 golangci-lint run -v