Skip to content
This repository was archived by the owner on Jun 30, 2025. It is now read-only.

Commit 68e6f2d

Browse files
authored
Merge pull request sosedoff#509 from MobileTeleSystems/move-to-go-modules
move project to go modules
2 parents a3f0de7 + 4a3145b commit 68e6f2d

File tree

655 files changed

+103
-311574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

655 files changed

+103
-311574
lines changed

Gopkg.lock

Lines changed: 0 additions & 208 deletions
This file was deleted.

Gopkg.toml

Lines changed: 0 additions & 74 deletions
This file was deleted.

Makefile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ usage:
2626
@echo ""
2727

2828
test:
29-
go test -race -cover ./pkg/...
29+
GO111MODULE=on go test -race -cover ./pkg/...
3030

3131
test-all:
3232
@./script/test_all.sh
@@ -39,11 +39,11 @@ dev-assets:
3939
@$(MAKE) --no-print-directory assets BINDATA_OPTS="-debug"
4040

4141
dev: dev-assets
42-
go build
42+
GO111MODULE=on go build
4343
@echo "You can now execute ./pgweb"
4444

4545
build: assets
46-
go build
46+
GO111MODULE=on go build
4747
@echo "You can now execute ./pgweb"
4848

4949
release: clean assets
@@ -54,12 +54,12 @@ release: clean assets
5454
-output "./bin/pgweb_{{.OS}}_{{.Arch}}"
5555

5656
@echo "Building ARM binaries..."
57-
GOOS=linux GOARCH=arm GOARM=5 go build \
57+
GO111MODULE=on GOOS=linux GOARCH=arm GOARM=5 go build \
5858
-ldflags "-s -w -X github.com/sosedoff/pgweb/pkg/command.GitCommit=$(GIT_COMMIT) -X github.com/sosedoff/pgweb/pkg/command.BuildTime=$(BUILD_TIME) -X github.com/sosedoff/pgweb/pkg/command.GoVersion=$(GO_VERSION)" \
5959
-o "./bin/pgweb_linux_arm_v5"
6060

6161
@echo "Building ARM64 binaries..."
62-
GOOS=linux GOARCH=arm64 GOARM=7 go build \
62+
GO111MODULE=on GOOS=linux GOARCH=arm64 GOARM=7 go build \
6363
-ldflags "-s -w -X github.com/sosedoff/pgweb/pkg/command.GitCommit=$(GIT_COMMIT) -X github.com/sosedoff/pgweb/pkg/command.BuildTime=$(BUILD_TIME) -X github.com/sosedoff/pgweb/pkg/command.GoVersion=$(GO_VERSION)" \
6464
-o "./bin/pgweb_linux_arm64_v7"
6565

@@ -70,11 +70,8 @@ bootstrap:
7070
gox -build-toolchain
7171

7272
setup:
73-
go get -u github.com/golang/dep/cmd/dep
74-
go get -u golang.org/x/tools/cmd/cover
7573
go get -u github.com/mitchellh/gox
7674
go get -u github.com/go-bindata/go-bindata/...
77-
dep ensure
7875

7976
clean:
8077
@rm -f ./pgweb

appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ install:
1414
- cd %APPVEYOR_BUILD_FOLDER%
1515
- go env
1616
- go version
17-
- go get github.com/golang/dep/cmd/dep
18-
- dep ensure
1917

2018
build_script:
2119
- go build

go.mod

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
module github.com/sosedoff/pgweb
2+
3+
go 1.12
4+
5+
require (
6+
github.com/BurntSushi/toml v0.3.1
7+
github.com/ScaleFT/sshkeys v0.0.0-20181112160850-82451a803681
8+
github.com/davecgh/go-spew v1.1.1 // indirect
9+
github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
10+
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect
11+
github.com/gin-gonic/gin v1.3.0
12+
github.com/go-sql-driver/mysql v1.5.0 // indirect
13+
github.com/golang/protobuf v0.0.0-20170601230230-5a0f697c9ed9 // indirect
14+
github.com/google/gofuzz v1.2.0 // indirect
15+
github.com/jessevdk/go-flags v1.4.0
16+
github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0
17+
github.com/json-iterator/go v0.0.0-20170829155851-36b14963da70 // indirect
18+
github.com/lib/pq v1.1.1
19+
github.com/mattn/go-isatty v0.0.2-0.20170307163044-57fdcb988a5c // indirect
20+
github.com/mattn/go-sqlite3 v1.14.6 // indirect
21+
github.com/mitchellh/go-homedir v1.0.0
22+
github.com/pmezard/go-difflib v1.0.0 // indirect
23+
github.com/stretchr/testify v1.2.2
24+
github.com/tuvistavie/securerandom v0.0.0-20140719024926-15512123a948
25+
github.com/ugorji/go v0.0.0-20170215201144-c88ee250d022 // indirect
26+
golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf
27+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
28+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
29+
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
30+
gopkg.in/go-playground/validator.v8 v8.18.1 // indirect
31+
gopkg.in/yaml.v2 v2.0.0-20160928153709-a5b47d31c556 // indirect
32+
)

0 commit comments

Comments
 (0)