From b6446dc0e246df660bcb506f9e43c62c0ada8d81 Mon Sep 17 00:00:00 2001 From: Vladimir Mihailenco Date: Wed, 23 Mar 2022 14:33:29 +0200 Subject: [PATCH] chore: fix release script --- chotel/go.mod | 2 ++ chotel/go.sum | 1 - go.mod | 4 ++-- go.sum | 4 ++-- scripts/release.sh | 7 ++++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/chotel/go.mod b/chotel/go.mod index 7853608..475a575 100644 --- a/chotel/go.mod +++ b/chotel/go.mod @@ -4,6 +4,8 @@ go 1.18 replace github.com/uptrace/go-clickhouse => ./.. +replace github.com/uptrace/go-clickhouse/chdebug => ../chdebug + require ( github.com/uptrace/go-clickhouse v0.2.3 go.opentelemetry.io/otel v1.5.0 diff --git a/chotel/go.sum b/chotel/go.sum index 8fb5414..c9c30d4 100644 --- a/chotel/go.sum +++ b/chotel/go.sum @@ -22,7 +22,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/uptrace/go-clickhouse/chdebug v0.2.1 h1:ol+HaBrbnCN15/GLB6ybYdedBt3SOqU+oV6wjPYCt1M= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= diff --git a/go.mod b/go.mod index ec8323b..e95605b 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/jinzhu/inflection v1.0.0 github.com/pierrec/lz4/v4 v4.1.14 github.com/stretchr/testify v1.7.1 - github.com/uptrace/go-clickhouse/chdebug v0.2.1 - golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 + github.com/uptrace/go-clickhouse/chdebug v0.2.3 + golang.org/x/exp v0.0.0-20220321173239-a90fa8a75705 ) require ( diff --git a/go.sum b/go.sum index d35e6d6..befdc14 100644 --- a/go.sum +++ b/go.sum @@ -27,8 +27,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 h1:s/+U+w0teGzcoH2mdIlFQ6KfVKGaYpgyGdUefZrn9TU= -golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20220321173239-a90fa8a75705 h1:ba9YlqfDGTTQ5aZ2fwOoQ1hf32QySyQkR6ODGDzHlnE= +golang.org/x/exp v0.0.0-20220321173239-a90fa8a75705/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/scripts/release.sh b/scripts/release.sh index c6ecee4..61bf960 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -41,21 +41,22 @@ fi git checkout master -PACKAGE_DIRS=$(find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; \ +PACKAGE_DIRS=$(find . -mindepth 1 -type f -name 'go.mod' -exec dirname {} \; \ | sed 's/^\.\///' \ | sort) for dir in $PACKAGE_DIRS do printf "${dir}: go get -u && go mod tidy\n" - (cd ./${dir} && go get -u && go mod tidy) + (cd ${dir} && go get -u && go mod tidy) done for dir in $PACKAGE_DIRS do sed --in-place \ "s/uptrace\/go-clickhouse\([^ ]*\) v.*/uptrace\/go-clickhouse\1 ${TAG}/" "${dir}/go.mod" - (cd ./${dir} && go mod tidy) + printf "${dir}: go mod tidy\n" + (cd ${dir} && go mod tidy) done