Skip to content

Commit

Permalink
Up dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
demdxx committed Nov 19, 2022
1 parent af4a570 commit 1a92355
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 72 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/golangci-lint.yml

This file was deleted.

63 changes: 39 additions & 24 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,76 @@
on:
push:
tags:
- v*
branches:
- master
- main
pull_request:
branches:
- master
- main

name: run tests
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.18.x
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Run linters
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
version: v1.29
version: v1.48.0
skip-cache: true
args: --fix

test:
needs: lint
strategy:
matrix:
go-version: [1.18.x]
go-version: [1.18.x, 1.19.x]
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Install Go
if: success()
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Run tests
run: go test -v -covermode=count

coverage:
runs-on: ubuntu-latest
needs: test
strategy:
fail-fast: false
matrix:
go-version: [1.18.x, 1.19.x]
steps:
- name: Install Go
if: success()
uses: actions/setup-go@v2
with:
go-version: 1.18.x
- name: Checkout code
uses: actions/checkout@v2
- name: Calc coverage
run: |
go test -v -covermode=count -coverprofile=coverage.out ./...
- name: Convert coverage.out to coverage.lcov
uses: jandelgado/gcov2lcov-action@v1.0.8
- name: Coveralls
uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: coverage.lcov
- uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v3
- run: go test -v -coverprofile=profile.cov ./...
- name: Send coverage
uses: shogo82148/actions-goveralls@v1
with:
path-to-profile: profile.cov
flag-name: Go-${{ matrix.go-version }}
parallel: true

# notifies that all test jobs are finished.
finish:
needs: coverage
runs-on: ubuntu-latest
steps:
- uses: shogo82148/actions-goveralls@v1
with:
parallel-finished: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# Folders
_obj
_test
.vscode

# Architecture specific extensions/prefixes
*.[568vq]
Expand Down
41 changes: 18 additions & 23 deletions .vscode/targets.log
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ make all --print-data-base --no-builtin-variables --no-builtin-rules --question
# PARTICULAR PURPOSE.

# This program built for i386-apple-darwin11.3.0

make: *** No rule to make target `all'. Stop.

# Make data base, printed on Sun Jun 26 14:21:51 2022

# Make data base, printed on Sat Nov 19 15:37:53 2022

# Variables

# automatic
<D = $(patsubst %/,%,$(dir $<))
# automatic

?F = $(notdir $?)
# environment
VSCODE_LOG_NATIVE = false
# automatic
?D = $(patsubst %/,%,$(dir $?))
# environment
Expand All @@ -38,14 +40,10 @@ MAKEFILE_LIST := Makefile
# environment
VSCODE_AMD_ENTRYPOINT = vs/workbench/api/node/extensionHostProcess
# environment
VSCODE_VERBOSE_LOGGING = true
# environment
__CFBundleIdentifier = com.microsoft.VSCode
# environment
INFOPATH = /usr/local/share/info:
# environment
VSCODE_IPC_HOOK_EXTHOST = /var/folders/sd/h9mn_6ss64l0sq6cg0f2408h0000gn/T/vscode-ipc-c2a58649-1911-4d65-8a44-dc22174306cf.sock
# environment
VSCODE_CWD = /
# environment
GOPROXY = https://goproxy.io,direct
Expand All @@ -56,21 +54,17 @@ DOCKER_DEFAULT_GOARCH = arm
# environment
GOPATH = /Users/dem/go
# environment
VSCODE_LOG_STACK = false
# environment
ELECTRON_RUN_AS_NODE = 1
# environment
LDFLAGS = -L/usr/local/opt/openblas/lib
# default
.FEATURES := target-specific order-only second-expansion else-if archives jobserver check-symlink
# environment
SSH_AUTH_SOCK = /private/tmp/com.apple.launchd.qhWQvphGpY/Listeners
SSH_AUTH_SOCK = /private/tmp/com.apple.launchd.ZBtbAVT9sN/Listeners
# automatic
%F = $(notdir $%)
# environment
DISPLAY = /private/tmp/com.apple.launchd.zSqREiT1CQ/org.xquartz:0
# environment
VSCODE_PIPE_LOGGING = true
DISPLAY = /private/tmp/com.apple.launchd.9ovYcPnhB5/org.xquartz:0
# environment
PWD = /Users/dem/workspace/opensource/gosql
# environment
Expand All @@ -86,7 +80,7 @@ HOME = /Users/dem
# default
MAKEFILEPATH = $(shell /usr/bin/xcode-select -print-path 2>/dev/null || echo /Developer)/Makefiles
# environment
VSCODE_CODE_CACHE_PATH = /Users/dem/Library/Application Support/Code/CachedData/30d9c6cd9483b2cc586687151bcbcd635f373630
VSCODE_CODE_CACHE_PATH = /Users/dem/Library/Application Support/Code/CachedData/6261075646f055b99068d3688932416f2346dd3b
# environment
LOGNAME = dem
# environment
Expand Down Expand Up @@ -120,15 +114,17 @@ TMPDIR = /var/folders/sd/h9mn_6ss64l0sq6cg0f2408h0000gn/T/
# automatic
*F = $(notdir $*)
# environment
VSCODE_IPC_HOOK = /Users/dem/Library/Application Support/Code/1.68.1-main.sock
VSCODE_IPC_HOOK = /Users/dem/Library/Application Support/Code/1.73.1-main.sock
# environment
MallocNanoZone = 0
# makefile
MAKEFLAGS = Rrqp
# environment
MFLAGS = -Rrqp
# automatic
*D = $(patsubst %/,%,$(dir $*))
# environment
XPC_SERVICE_NAME = application.com.microsoft.VSCode.90202753.90202759
XPC_SERVICE_NAME = application.com.microsoft.VSCode.105303624.105303630
# environment
HOMEBREW_PREFIX = /usr/local
# automatic
Expand Down Expand Up @@ -160,19 +156,19 @@ MAKELEVEL := 0
# environment
LANG = C
# environment
DOCKER_HOST = ssh://pi@raspberrypi.home
DOCKER_HOST = ssh://pi@raspberrypi.local
# environment
VSCODE_PID = 85886
VSCODE_PID = 21031
# variable set hash-table stats:
# Load=76/1024=7%, Rehash=0, Collisions=2/101=2%
# Load=72/1024=7%, Rehash=0, Collisions=2/97=2%

# Pattern-specific Variable Values

# No pattern-specific variable values.

# Directories

# . (device 16777230, inode 6886728): 25 files, no impossibilities.
# . (device 16777232, inode 6886728): 25 files, no impossibilities.

# 25 files, no impossibilities in 1 directories.

Expand All @@ -188,6 +184,7 @@ all:
# Implicit rule search has been done.
# File does not exist.
# File has not been updated.

# variable set hash-table stats:
# Load=0/32=0%, Rehash=0, Collisions=0/0=0%

Expand Down Expand Up @@ -293,8 +290,6 @@ lint:
# strcache size: total = 4096 / max = 4096 / min = 4096 / avg = 4096
# strcache free: total = 4087 / max = 4087 / min = 4087 / avg = 4087

# Finished Make data base on Sun Jun 26 14:21:51 2022
# Finished Make data base on Sat Nov 19 15:37:53 2022


make: *** No rule to make target `all'. Stop.

3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module github.com/geniusrabbit/gosql/v2
go 1.18

require (
github.com/stretchr/testify v1.7.5
github.com/stretchr/testify v1.8.1
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/exp v0.0.0-20221114191408-850992195362
gopkg.in/yaml.v3 v3.0.1 // indirect
)
8 changes: 6 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q=
github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
golang.org/x/exp v0.0.0-20221114191408-850992195362 h1:NoHlPRbyl1VFI6FjwHtPQCN7wAMXI6cKcqrmXhOOfBQ=
golang.org/x/exp v0.0.0-20221114191408-850992195362/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY=
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
Expand Down
2 changes: 1 addition & 1 deletion model_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// @project GeniusRabbit
// @author Dmitry Ponomarev <demdxx@gmail.com> 2016, 2020
// @author Dmitry Ponomarev <demdxx@gmail.com> 2016, 2020, 2022
//

package gosql
Expand Down
2 changes: 1 addition & 1 deletion nullable_json.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// @project GeniusRabbit
// @author Dmitry Ponomarev <demdxx@gmail.com> 2016 – 2018
// @author Dmitry Ponomarev <demdxx@gmail.com> 2016 – 2018, 2022
//

package gosql
Expand Down
4 changes: 3 additions & 1 deletion tarray_encode_decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import (
"bytes"
"strconv"
"strings"

"golang.org/x/exp/constraints"
)

// Number general type
type Number interface {
int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64 | float32 | float64
constraints.Integer | constraints.Float
}

// ArrayNumberDecode decodes array of type int
Expand Down

0 comments on commit 1a92355

Please sign in to comment.