Skip to content

Commit

Permalink
go 1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
hangxie committed Aug 22, 2021
1 parent 6b6ae59 commit 1fa4cc8
Show file tree
Hide file tree
Showing 4 changed files with 263 additions and 101 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
working_directory: ~/repo
docker:
- image: circleci/golang:1.16.3
- image: circleci/golang:1.17-rc
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
release-build:
working_directory: ~/repo
docker:
- image: circleci/golang:1.16.3
- image: circleci/golang:1.17-rc
steps:
- checkout
- restore_cache:
Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ VERSION = $(shell git describe --tags)
BUILD = $(shell date +%FT%T%z)
BUILDDIR = $(CURDIR)/build
GOBIN = $(shell go env GOPATH)/bin
REL_TARGET = darwin-amd64 darwin-arm64 linux-amd64 linux-arm linux-arm64 windows-386 windows-amd64 windows-arm
REL_TARGET = \
darwin-amd64 darwin-arm64 \
linux-386 linux-amd64 linux-arm linux-arm64 \
windows-386 windows-amd64 windows-arm windows-arm64

# go option
GO ?= go
Expand Down Expand Up @@ -41,9 +44,9 @@ deps: ## Install prerequisite for build
tools: ## Install build tools
@echo "==> Installing build tools"
@test -x $(GOBIN)/golangci-lint || \
(cd /tmp; GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.1)
(cd /tmp; GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.1)
@test -x $(GOBIN)/go-junit-report || \
(cd /tmp; go get -u github.com/jstemmer/go-junit-report)
(cd /tmp; go install -u github.com/jstemmer/go-junit-report)


build: deps ## Build locally for local os/arch creating $(BUILDDIR) in ./
Expand Down
44 changes: 39 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,52 @@
module github.com/hangxie/parquet-tools

go 1.16
go 1.17

require (
github.com/Azure/azure-storage-blob-go v0.10.0
github.com/Azure/azure-storage-blob-go v0.13.0
github.com/alecthomas/kong v0.2.16
github.com/aws/aws-sdk-go v1.38.30
github.com/aws/aws-sdk-go v1.38.45
github.com/stretchr/testify v1.6.1
github.com/xitongsys/parquet-go v1.6.1-0.20210531003158-8ed615220b7d
github.com/xitongsys/parquet-go-source v0.0.0-20201108113611-f372b7d813be
)

replace github.com/hangxie/parquet-tools/cmd => ./cmd
require (
cloud.google.com/go v0.81.0 // indirect
cloud.google.com/go/storage v1.15.0 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/apache/thrift v0.14.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/uuid v1.1.1 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/klauspost/compress v1.10.5 // indirect
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
golang.org/x/mod v0.4.1 // indirect
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect
golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78 // indirect
golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750 // indirect
golang.org/x/text v0.3.5 // indirect
golang.org/x/tools v0.1.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/api v0.45.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210420162539-3c870d7478d2 // indirect
google.golang.org/grpc v1.37.0 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)

replace google.golang.org/grpc => google.golang.org/grpc v1.29.1

replace github.com/xitongsys/parquet-go-source => github.com/hangxie/parquet-go-source v0.0.0-20210531233818-4f87c7cf556b
replace github.com/xitongsys/parquet-go-source => github.com/hangxie/parquet-go-source v0.0.2

replace github.com/xitongsys/parquet-go => github.com/hangxie/parquet-go v1.6.1
Loading

0 comments on commit 1fa4cc8

Please sign in to comment.