Skip to content

Commit afe9a6b

Browse files
committed
[patch] update deps including fastime v1.1.9
Signed-off-by: kpango <[email protected]>
1 parent 9ca9b95 commit afe9a6b

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

.circleci/config.yml

+7-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
alias:
22
default: &default
33
docker:
4-
- image: cimg/go:1.19.3
4+
- image: cimg/go:1.20.2
55
environment:
66
GO111MODULE: "on"
77
REPO_NAME: "kpango"
@@ -10,6 +10,7 @@ alias:
1010
DOCKER_USER: "kpango"
1111
setup_remote_docker: &setup_remote_docker
1212
version: 20.10.18
13+
docker_layer_caching: true
1314

1415
version: 2
1516
jobs:
@@ -26,13 +27,11 @@ jobs:
2627
- run:
2728
name: run tests
2829
command: |
29-
rm -rf example
30-
go test -v -timeout 1h -race -covermode=atomic -coverprofile=coverage.out ./...
30+
go test -v -race -covermode=atomic -coverprofile=coverage.out ./...
3131
go tool cover -html=coverage.out -o coverage.html
3232
bash <(curl -s https://codecov.io/bash)
33-
no_output_timeout: 1.5h
3433
- store_artifacts:
35-
gath: ./coverage.html
34+
path: ./coverage.html
3635
- save_cache:
3736
key: gosum-{{ .Branch }}-{{ checksum "go.sum" }}
3837
paths:
@@ -46,8 +45,9 @@ jobs:
4645
command: |
4746
mkdir -p $HOME/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
4847
LAST_COMMIT=`git log -1 --pretty=%B`
48+
VERSION=`git describe --abbrev=0 --tags`
4949
touch ./.tag
50-
if VERSION=`git describe --abbrev=0 --tags` && [ ! -z "`git diff $VERSION`" -o -z "$VERSION" ]; then
50+
if [ ! -z "`git diff $VERSION`" -o -z "$VERSION" ]; then
5151
VERSION=${VERSION:-'0.0.0'}
5252
MAJOR="${VERSION%%.*}"; VERSION="${VERSION#*.}"
5353
MINOR="${VERSION%%.*}"; VERSION="${VERSION#*.}"
@@ -62,14 +62,6 @@ jobs:
6262
PATCH=$((PATCH+1))
6363
echo "$MAJOR.$MINOR.$PATCH" > ./.tag
6464
fi
65-
else
66-
if echo $LAST_COMMIT | grep "\[\(major\|MAJOR\)\]" > /dev/null; then
67-
echo "v1.0.0" > ./.tag
68-
elif echo $LAST_COMMIT | grep "\[\(minor\|MINOR\)\]" > /dev/null; then
69-
echo "v0.1.0" > ./.tag
70-
elif echo $LAST_COMMIT | grep "\[\(patch\|PATCH\)\]" > /dev/null; then
71-
echo "v0.0.1" > ./.tag
72-
fi
7365
fi
7466
- persist_to_workspace:
7567
root: .
@@ -121,7 +113,7 @@ workflows:
121113
filters:
122114
branches:
123115
only:
124-
- main
116+
- master
125117
- push:
126118
requires:
127119
- versioning

go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/kpango/glg
22

3-
go 1.19
3+
go 1.20
44

55
require (
6-
github.com/goccy/go-json v0.9.11
7-
github.com/kpango/fastime v1.1.6
6+
github.com/goccy/go-json v0.10.2
7+
github.com/kpango/fastime v1.1.9
88
github.com/sirupsen/logrus v1.9.0
9-
go.uber.org/zap v1.23.0
9+
go.uber.org/zap v1.24.0
1010
)
1111

1212
require (

go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLj
22
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
6-
github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
7-
github.com/kpango/fastime v1.1.6 h1:lAw1Tiwnlbsx1xZs6W9eM7/8niwabknewbmLkh/yTVo=
8-
github.com/kpango/fastime v1.1.6/go.mod h1:tTNDbIo5qL6D7g5vh2YbkyUbOVP2kD/we3rSjN22PMY=
5+
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
6+
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
7+
github.com/kpango/fastime v1.1.9 h1:xVQHcqyPt5M69DyFH7g1EPRns1YQNap9d5eLhl/Jy84=
8+
github.com/kpango/fastime v1.1.9/go.mod h1:vyD7FnUn08zxY4b/QFBZVG+9EWMYsNl+QF0uE46urD4=
99
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
1010
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1111
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -20,8 +20,8 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
2020
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
2121
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
2222
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
23-
go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
24-
go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
23+
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
24+
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
2525
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
2626
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2727
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)