Skip to content

Commit

Permalink
Merge pull request sosedoff#509 from MobileTeleSystems/move-to-go-mod…
Browse files Browse the repository at this point in the history
…ules

move project to go modules
  • Loading branch information
sosedoff authored Mar 4, 2021
2 parents a3f0de7 + 4a3145b commit 68e6f2d
Show file tree
Hide file tree
Showing 655 changed files with 103 additions and 311,574 deletions.
208 changes: 0 additions & 208 deletions Gopkg.lock

This file was deleted.

74 changes: 0 additions & 74 deletions Gopkg.toml

This file was deleted.

13 changes: 5 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ usage:
@echo ""

test:
go test -race -cover ./pkg/...
GO111MODULE=on go test -race -cover ./pkg/...

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

dev: dev-assets
go build
GO111MODULE=on go build
@echo "You can now execute ./pgweb"

build: assets
go build
GO111MODULE=on go build
@echo "You can now execute ./pgweb"

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

@echo "Building ARM binaries..."
GOOS=linux GOARCH=arm GOARM=5 go build \
GO111MODULE=on GOOS=linux GOARCH=arm GOARM=5 go build \
-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)" \
-o "./bin/pgweb_linux_arm_v5"

@echo "Building ARM64 binaries..."
GOOS=linux GOARCH=arm64 GOARM=7 go build \
GO111MODULE=on GOOS=linux GOARCH=arm64 GOARM=7 go build \
-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)" \
-o "./bin/pgweb_linux_arm64_v7"

Expand All @@ -70,11 +70,8 @@ bootstrap:
gox -build-toolchain

setup:
go get -u github.com/golang/dep/cmd/dep
go get -u golang.org/x/tools/cmd/cover
go get -u github.com/mitchellh/gox
go get -u github.com/go-bindata/go-bindata/...
dep ensure

clean:
@rm -f ./pgweb
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ install:
- cd %APPVEYOR_BUILD_FOLDER%
- go env
- go version
- go get github.com/golang/dep/cmd/dep
- dep ensure

build_script:
- go build
Expand Down
32 changes: 32 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module github.com/sosedoff/pgweb

go 1.12

require (
github.com/BurntSushi/toml v0.3.1
github.com/ScaleFT/sshkeys v0.0.0-20181112160850-82451a803681
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect
github.com/gin-gonic/gin v1.3.0
github.com/go-sql-driver/mysql v1.5.0 // indirect
github.com/golang/protobuf v0.0.0-20170601230230-5a0f697c9ed9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/jessevdk/go-flags v1.4.0
github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0
github.com/json-iterator/go v0.0.0-20170829155851-36b14963da70 // indirect
github.com/lib/pq v1.1.1
github.com/mattn/go-isatty v0.0.2-0.20170307163044-57fdcb988a5c // indirect
github.com/mattn/go-sqlite3 v1.14.6 // indirect
github.com/mitchellh/go-homedir v1.0.0
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.2.2
github.com/tuvistavie/securerandom v0.0.0-20140719024926-15512123a948
github.com/ugorji/go v0.0.0-20170215201144-c88ee250d022 // indirect
golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/go-playground/validator.v8 v8.18.1 // indirect
gopkg.in/yaml.v2 v2.0.0-20160928153709-a5b47d31c556 // indirect
)
Loading

0 comments on commit 68e6f2d

Please sign in to comment.