diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000..374aabd --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,3 @@ +FROM gitpod/workspace-full + +RUN npm i -g nodemon diff --git a/.gitpod.yml b/.gitpod.yml index 6222da3..103c91d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,5 @@ -ports: - - port: 8080 +image: + file: .gitpod.Dockerfile checkoutLocation: "go/src/pingbot" workspaceLocation: "go/src/pingbot" diff --git a/config/version.go b/config/version.go index 2a0ef3d..4cbf786 100644 --- a/config/version.go +++ b/config/version.go @@ -1,3 +1,3 @@ package config -var Version = "1.3.0" +var Version = "1.3.1" diff --git a/go.mod b/go.mod index e71487c..f20456d 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,8 @@ module gitlab.com/gaming0skar123/go/pingbot go 1.16 require ( - github.com/blang/semver v3.5.1+incompatible + github.com/MedzikUser/go-github-selfupdate v1.3.1 + github.com/blang/semver/v4 v4.0.0 github.com/gin-contrib/cors v1.3.1 github.com/gin-gonic/gin v1.7.2 github.com/go-playground/validator/v10 v10.7.0 // indirect @@ -21,7 +22,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect github.com/posener/complete v1.2.3 // indirect - github.com/rhysd/go-github-selfupdate v1.2.3 github.com/sirupsen/logrus v1.8.1 github.com/struCoder/pidusage v0.2.0 github.com/ugorji/go v1.2.6 // indirect diff --git a/go.sum b/go.sum index 28b5f75..61d5776 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,10 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/MedzikUser/go-github-selfupdate v1.3.1 h1:PlLrOMEucL8B2LNRUaceAgvu17J4x02NTcPa78ZMxl0= +github.com/MedzikUser/go-github-selfupdate v1.3.1/go.mod h1:vq1/KNWXN7R/aKZFD5p2rsIdQ+2FSXnlIts1QHEZCM4= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -224,8 +226,6 @@ github.com/posener/complete v1.2.2-0.20190308074557-af07aa5181b3/go.mod h1:6gapU github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rhysd/go-github-selfupdate v1.2.3 h1:iaa+J202f+Nc+A8zi75uccC8Wg3omaM7HDeimXA22Ag= -github.com/rhysd/go-github-selfupdate v1.2.3/go.mod h1:mp/N8zj6jFfBQy/XMYoWsmfzxazpPAODuqarmPDe2Rg= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/update/update.go b/update/update.go index 2697805..8a5b738 100644 --- a/update/update.go +++ b/update/update.go @@ -3,8 +3,8 @@ package update import ( "os" - "github.com/blang/semver" - "github.com/rhysd/go-github-selfupdate/selfupdate" + "github.com/MedzikUser/go-github-selfupdate/selfupdate" + "github.com/blang/semver/v4" "gitlab.com/gaming0skar123/go/pingbot/common" "gitlab.com/gaming0skar123/go/pingbot/config" ) @@ -31,7 +31,7 @@ func Update() { return } - err = selfupdate.UpdateTo(latest.AssetURL, exe) + err = selfupdate.UpdateTo(latest.AssetURL, exe, "pingbot.out") if common.CheckErr(err, "update binary") { return }