Skip to content

Commit

Permalink
upgrade to: go 1.21.3, thrift 0.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vaporz committed Oct 15, 2023
1 parent 554bdaf commit b4ed8d6
Show file tree
Hide file tree
Showing 19 changed files with 3,374 additions and 2,876 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: go
sudo: required

go:
- 1.14.x
- 1.21.x
go_import_path: github.com/vaporz/turbo
before_install:
# execute all of the commands which need to be executed
Expand Down
12 changes: 6 additions & 6 deletions .travis/install-thrift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ BUILD="$HOME/.thrift-build"
mkdir -p "$BUILD"
cd "$BUILD"

rm -rf thrift-0.12.0
rm -rf thrift-0.19.0
ls

if [ ! -d thrift-0.12.0 ]; then
if [ ! -d thrift-0.19.0 ]; then
sudo apt-get update -qq
sudo apt-get install libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev
wget http://archive.apache.org/dist/thrift/0.12.0/thrift-0.12.0.tar.gz
tar -xzf thrift-0.12.0.tar.gz
cd thrift-0.12.0
wget http://archive.apache.org/dist/thrift/0.19.0/thrift-0.19.0.tar.gz
tar -xzf thrift-0.19.0.tar.gz
cd thrift-0.19.0
./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --without-c_glib --without-cpp --without-nodejs --without-haskell --without-java --without-python --without-ruby --without-perl --without-php --without-erlang
else
cd thrift-0.12.0
cd thrift-0.19.0
fi

sudo make -j2
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Turbo  [![Build Status](https://travis-ci.org/vaporz/turbo.svg?branch=master)](https://travis-ci.org/vaporz/turbo) [![Coverage Status](https://coveralls.io/repos/github/vaporz/turbo/badge.svg?branch=master)](https://coveralls.io/github/vaporz/turbo?branch=master) [![Go Report Card](https://goreportcard.com/badge/github.com/vaporz/turbo)](https://goreportcard.com/report/github.com/vaporz/turbo) [![codebeat badge](https://codebeat.co/badges/7a166e48-dae1-454c-b925-4fbcd3f1f461)](https://codebeat.co/projects/github-com-vaporz-turbo-master)

最新版本 | Latest Release: 0.4.2
最新版本 | Latest Release: 0.5.0

文档地址 | Documentation: https://vaporz.github.io

Expand Down Expand Up @@ -39,5 +39,6 @@ Please create an issue if you have encountered any problems or have any new idea
* [Configs in service.yaml](https://vaporz.github.io/master/en/config.html#config)
* [Service Multiplexing](https://vaporz.github.io/master/en/multiplexing.html)
## Requirements
Golang version: >= 1.14.x
Thrift version: 0.12.0
Golang version: >= 1.21.3

Thrift version: 0.19.0
2 changes: 1 addition & 1 deletion generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func methodNames(urlServiceMaps [][4]string) map[string][]string {
if methodNamesMap[v[2]] == nil {
methodNamesMap[v[2]] = make(map[string]int)
}
methodNamesMap[v[2]][v[3]] = 0
methodNamesMap[v[2]][v[3]] = 0 //map [ServiceName] [MethodName] = 0
}
methodNames := make(map[string][]string)
for k, v := range methodNamesMap {
Expand Down
52 changes: 38 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,43 @@
module github.com/vaporz/turbo

go 1.14
go 1.21.3

require (
github.com/apache/thrift v0.12.0
github.com/bitly/go-simplejson v0.5.0
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/fsnotify/fsnotify v1.4.9
github.com/golang/protobuf v1.4.2
github.com/gorilla/mux v1.7.4
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.5.1
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
google.golang.org/grpc v1.29.1
google.golang.org/protobuf v1.23.0
github.com/apache/thrift v0.19.0
github.com/bitly/go-simplejson v0.5.1
github.com/fsnotify/fsnotify v1.6.0
github.com/golang/protobuf v1.5.3
github.com/gorilla/mux v1.8.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.17.0
github.com/stretchr/testify v1.8.4
golang.org/x/net v0.17.0
google.golang.org/grpc v1.58.3
google.golang.org/protobuf v1.31.0
)

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit b4ed8d6

Please sign in to comment.