From afe9a6b004489b54cb367e4111f62f9c812d4c42 Mon Sep 17 00:00:00 2001 From: kpango Date: Thu, 23 Mar 2023 01:01:04 +0900 Subject: [PATCH] [patch] update deps including fastime v1.1.9 Signed-off-by: kpango --- .circleci/config.yml | 22 +++++++--------------- go.mod | 8 ++++---- go.sum | 12 ++++++------ 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0ec58f..2d309f0 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ alias: default: &default docker: - - image: cimg/go:1.19.3 + - image: cimg/go:1.20.2 environment: GO111MODULE: "on" REPO_NAME: "kpango" @@ -10,6 +10,7 @@ alias: DOCKER_USER: "kpango" setup_remote_docker: &setup_remote_docker version: 20.10.18 + docker_layer_caching: true version: 2 jobs: @@ -26,13 +27,11 @@ jobs: - run: name: run tests command: | - rm -rf example - go test -v -timeout 1h -race -covermode=atomic -coverprofile=coverage.out ./... + go test -v -race -covermode=atomic -coverprofile=coverage.out ./... go tool cover -html=coverage.out -o coverage.html bash <(curl -s https://codecov.io/bash) - no_output_timeout: 1.5h - store_artifacts: - gath: ./coverage.html + path: ./coverage.html - save_cache: key: gosum-{{ .Branch }}-{{ checksum "go.sum" }} paths: @@ -46,8 +45,9 @@ jobs: command: | mkdir -p $HOME/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config LAST_COMMIT=`git log -1 --pretty=%B` + VERSION=`git describe --abbrev=0 --tags` touch ./.tag - if VERSION=`git describe --abbrev=0 --tags` && [ ! -z "`git diff $VERSION`" -o -z "$VERSION" ]; then + if [ ! -z "`git diff $VERSION`" -o -z "$VERSION" ]; then VERSION=${VERSION:-'0.0.0'} MAJOR="${VERSION%%.*}"; VERSION="${VERSION#*.}" MINOR="${VERSION%%.*}"; VERSION="${VERSION#*.}" @@ -62,14 +62,6 @@ jobs: PATCH=$((PATCH+1)) echo "$MAJOR.$MINOR.$PATCH" > ./.tag fi - else - if echo $LAST_COMMIT | grep "\[\(major\|MAJOR\)\]" > /dev/null; then - echo "v1.0.0" > ./.tag - elif echo $LAST_COMMIT | grep "\[\(minor\|MINOR\)\]" > /dev/null; then - echo "v0.1.0" > ./.tag - elif echo $LAST_COMMIT | grep "\[\(patch\|PATCH\)\]" > /dev/null; then - echo "v0.0.1" > ./.tag - fi fi - persist_to_workspace: root: . @@ -121,7 +113,7 @@ workflows: filters: branches: only: - - main + - master - push: requires: - versioning diff --git a/go.mod b/go.mod index 4514ae3..e4b4469 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/kpango/glg -go 1.19 +go 1.20 require ( - github.com/goccy/go-json v0.9.11 - github.com/kpango/fastime v1.1.6 + github.com/goccy/go-json v0.10.2 + github.com/kpango/fastime v1.1.9 github.com/sirupsen/logrus v1.9.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( diff --git a/go.sum b/go.sum index 48ed80a..609b67f 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,10 @@ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLj github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/kpango/fastime v1.1.6 h1:lAw1Tiwnlbsx1xZs6W9eM7/8niwabknewbmLkh/yTVo= -github.com/kpango/fastime v1.1.6/go.mod h1:tTNDbIo5qL6D7g5vh2YbkyUbOVP2kD/we3rSjN22PMY= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/kpango/fastime v1.1.9 h1:xVQHcqyPt5M69DyFH7g1EPRns1YQNap9d5eLhl/Jy84= +github.com/kpango/fastime v1.1.9/go.mod h1:vyD7FnUn08zxY4b/QFBZVG+9EWMYsNl+QF0uE46urD4= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= 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= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=