github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

changes to try and get a successful build

pull/1045/head
Adam Boutcher 2021-08-13 14:01:02 +01:00
parent 27ec3b0cc7
commit 4736a95d81
10 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@ -10,7 +10,7 @@ BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}"
TRVIS_SECRET=O3/2KTOV8krv+yZ1EB/7D1RQRe6NdpFUEJNJkMS/ollYqmz3x2mCO7yIgIJKCKguLXZxjM6CxJcjlCrvUwibL+8BBp7xJe4XFIOrjkPvbbVPry4HkFZCf2GfcUK6o4AByQ+RYqsW2F17Fp9KLQ1rL3OT3eLTwCAGKx3tlY8y+an43zkmo5dN64V6sawx26fh6XTfww590ey+ltgQTjf8UPNup2wZmGvMo9Hwvh/bYR/47bR6PlBh6vhlKWyotKf2Fz1Bevbu0zc35pee5YlsrHR+oSF+/nNd/dOij34BhtqQikUR+zQVy9yty8SlmneVwD3yOENvlF+8roeKIXb6P6eZnSMHvelhWpAFTwDXq2N3d/FIgrQtLxsAFTI3nTHvZgs6OoTd6dA0wkhuIGLxaL3FOeztCdxP5J/CQ9GUcTvifh5ArGGwYxRxQU6rTgtebJcNtXFISP9CEUR6rwRtb6ax7h6f1SbjUGAdxt+r2LbEVEk4ZlwHvdJ2DtzJHT5DQtLrqq/CTUgJ8SJFMkrJMp/pPznKhzN4qvd8oQJXygSXX/gz92MvoX0xgpNeLsUdAn+PL9KketfR+QYosBz04d8k05E+aTqGaU7FUCHPTLwlOFvLD8Gbv0zsC/PWgSLXTBlcqLEz5PHwPVHTcVzspKj/IyYimXpCSbvu1YOIjyc= TRVIS_SECRET=O3/2KTOV8krv+yZ1EB/7D1RQRe6NdpFUEJNJkMS/ollYqmz3x2mCO7yIgIJKCKguLXZxjM6CxJcjlCrvUwibL+8BBp7xJe4XFIOrjkPvbbVPry4HkFZCf2GfcUK6o4AByQ+RYqsW2F17Fp9KLQ1rL3OT3eLTwCAGKx3tlY8y+an43zkmo5dN64V6sawx26fh6XTfww590ey+ltgQTjf8UPNup2wZmGvMo9Hwvh/bYR/47bR6PlBh6vhlKWyotKf2Fz1Bevbu0zc35pee5YlsrHR+oSF+/nNd/dOij34BhtqQikUR+zQVy9yty8SlmneVwD3yOENvlF+8roeKIXb6P6eZnSMHvelhWpAFTwDXq2N3d/FIgrQtLxsAFTI3nTHvZgs6OoTd6dA0wkhuIGLxaL3FOeztCdxP5J/CQ9GUcTvifh5ArGGwYxRxQU6rTgtebJcNtXFISP9CEUR6rwRtb6ax7h6f1SbjUGAdxt+r2LbEVEk4ZlwHvdJ2DtzJHT5DQtLrqq/CTUgJ8SJFMkrJMp/pPznKhzN4qvd8oQJXygSXX/gz92MvoX0xgpNeLsUdAn+PL9KketfR+QYosBz04d8k05E+aTqGaU7FUCHPTLwlOFvLD8Gbv0zsC/PWgSLXTBlcqLEz5PHwPVHTcVzspKj/IyYimXpCSbvu1YOIjyc=
PUBLISH_BODY='{ "request": { "branch": "master", "message": "Homebrew update version v${VERSION}", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }' PUBLISH_BODY='{ "request": { "branch": "master", "message": "Homebrew update version v${VERSION}", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }'
TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statping v${VERSION}", "config": { "merge_mode": "replace", "language": "go", "go": 1.14, "install": true, "sudo": "required", "services": ["docker"], "env": { "secure": "${TRVIS_SECRET}" }, "before_deploy": ["git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "git tag v$(VERSION) --force"], "deploy": [{ "provider": "releases", "api_key": "$$GITHUB_TOKEN", "file_glob": true, "file": "build/*", "skip_cleanup": true, "on": { "branch": "master" } }], "before_script": ["rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install stable", "nvm install 10.17.0", "nvm use 10.17.0 --default", "npm install -g sass yarn cross-env", "pip install --user awscli"], "script": ["make release"], "after_success": [], "after_deploy": ["make post-release"] } } }' TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statping v${VERSION}", "config": { "merge_mode": "replace", "language": "go", "go": 1.14, "install": true, "sudo": "required", "services": ["docker"], "env": { "secure": "${TRVIS_SECRET}" }, "before_deploy": ["git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "git tag v$(VERSION) --force"], "deploy": [{ "provider": "releases", "api_key": "$$GITHUB_TOKEN", "file_glob": true, "file": "build/*", "skip_cleanup": true, "on": { "branch": "master" } }], "before_script": ["rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install stable", "nvm install 10.17.0", "nvm use 10.17.0 --default", "npm install -g sass yarn cross-env", "pip install --user awscli"], "script": ["make release"], "after_success": [], "after_deploy": ["make post-release"] } } }'
TEST_DIR=$(GOPATH)/src/github.com/statping/statping TEST_DIR=$(GOPATH)/src/github.com/statping-ng/statping-ng
PATH:=$(GOPATH)/bin:$(PATH) PATH:=$(GOPATH)/bin:$(PATH)
OS = freebsd linux openbsd OS = freebsd linux openbsd
ARCHS = 386 arm amd64 arm64 ARCHS = 386 arm amd64 arm64
@ -44,7 +44,7 @@ down:
docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml down --volumes --remove-orphans docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml down --volumes --remove-orphans
lite: clean lite: clean
docker build -t statping/statping:dev -f dev/Dockerfile.dev . docker build -t statping-ng/statping-ng:dev -f dev/Dockerfile.dev .
docker-compose -f dev/docker-compose.lite.yml down docker-compose -f dev/docker-compose.lite.yml down
docker-compose -f dev/docker-compose.lite.yml up --remove-orphans docker-compose -f dev/docker-compose.lite.yml up --remove-orphans
@ -115,23 +115,23 @@ compose-build-full: docker-base
docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml build --parallel --build-arg VERSION=${VERSION} docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml build --parallel --build-arg VERSION=${VERSION}
docker-base: docker-base:
docker build -t statping/statping:base -f Dockerfile.base --build-arg VERSION=${VERSION} . docker build -t statping-ng/statping-ng:base -f Dockerfile.base --build-arg VERSION=${VERSION} .
docker-latest: docker-base docker-latest: docker-base
docker build -t statping/statping:latest --build-arg VERSION=${VERSION} . docker build -t statping-ng/statping-ng:latest --build-arg VERSION=${VERSION} .
docker-vue: docker-vue:
docker build -t statping/statping:vue --build-arg VERSION=${VERSION} . docker build -t statping-ng/statping-ng:vue --build-arg VERSION=${VERSION} .
docker-test: docker-test:
docker-compose -f docker-compose.test.yml up --remove-orphans docker-compose -f docker-compose.test.yml up --remove-orphans
push-base: clean compile docker-base push-base: clean compile docker-base
docker push statping/statping:base docker push statping-ng/statping-ng:base
push-vue: clean compile docker-base docker-vue push-vue: clean compile docker-base docker-vue
docker push statping/statping:base docker push statping-ng/statping-ng:base
docker push statping/statping:vue docker push statping-ng/statping-ng:vue
modd: modd:
modd -f ./dev/modd.conf modd -f ./dev/modd.conf
@ -287,20 +287,20 @@ download-key:
# push the :dev docker tag using curl # push the :dev docker tag using curl
dockerhub-dev: dockerhub-dev:
docker build --build-arg VERSION=${VERSION} -t statping/statping:dev --no-cache -f Dockerfile.base . docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:dev --no-cache -f Dockerfile.base .
docker push statping/statping:dev docker push statping-ng/statping-ng:dev
dockerhub: dockerhub:
docker build --build-arg VERSION=${VERSION} -t statping/statping:base --no-cache -f Dockerfile.base . docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:base --no-cache -f Dockerfile.base .
docker build --build-arg VERSION=${VERSION} -t statping/statping:latest --no-cache -f Dockerfile . docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:latest --no-cache -f Dockerfile .
docker tag statping/statping statping/statping:v${VERSION} docker tag statping-ng/statping-ng statping-ng/statping-ng:v${VERSION}
docker push statping/statping:base docker push statping-ng/statping-ng:base
docker push statping/statping:v${VERSION} docker push statping-ng/statping-ng:v${VERSION}
docker push statping/statping docker push statping-ng/statping-ng
docker-build-dev: docker-build-dev:
docker build --build-arg VERSION=${VERSION} -t statping/statping:latest --no-cache -f Dockerfile . docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:latest --no-cache -f Dockerfile .
docker tag statping/statping:latest statping/statping:dev-v${VERSION} docker tag statping-ng/statping-ng:latest statping-ng/statping-ng:dev-v${VERSION}
post-release: frontend-build upload_to_s3 publish-homebrew dockerhub post-release: frontend-build upload_to_s3 publish-homebrew dockerhub
@ -383,19 +383,19 @@ xgo-latest:
buildx-latest: multiarch buildx-latest: multiarch
docker buildx create --name statping-latest docker buildx create --name statping-latest
docker buildx inspect --builder statping-latest --bootstrap docker buildx inspect --builder statping-latest --bootstrap
docker buildx build --builder statping-latest --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping/statping:latest -t statping/statping:v${VERSION} --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . docker buildx build --builder statping-latest --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping-ng/statping-ng:latest -t statping-ng/statping-ng:v${VERSION} --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
docker buildx rm statping-latest docker buildx rm statping-latest
buildx-dev: multiarch buildx-dev: multiarch
docker buildx create --name statping-dev docker buildx create --name statping-dev
docker buildx inspect --builder statping-dev --bootstrap docker buildx inspect --builder statping-dev --bootstrap
docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping/statping:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping-ng/statping-ng:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
docker buildx rm statping-dev docker buildx rm statping-dev
buildx-base: multiarch buildx-base: multiarch
docker buildx create --name statping-base docker buildx create --name statping-base
docker buildx inspect --builder statping-base --bootstrap docker buildx inspect --builder statping-base --bootstrap
docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t statping/statping:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t statping-ng/statping-ng:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
docker buildx rm statping-base docker buildx rm statping-base
multiarch: multiarch:

4
cmd/cli.go
View File

@ -351,7 +351,7 @@ func ask(format string) bool {
func updateDisplay() error { func updateDisplay() error {
gitCurrent, err := checkGithubUpdates() gitCurrent, err := checkGithubUpdates()
if err != nil { if err != nil {
return errors.Wrap(err, "Issue connecting to https://github.com/statping/statping") return errors.Wrap(err, "Issue connecting to https://github.com/statping-ng/statping-ng")
} }
if gitCurrent.TagName == "" { if gitCurrent.TagName == "" {
return nil return nil
@ -395,7 +395,7 @@ func runOnce() error {
} }
func checkGithubUpdates() (githubResponse, error) { func checkGithubUpdates() (githubResponse, error) {
url := "https://api.github.com/repos/statping/statping/releases/latest" url := "https://api.github.com/repos/statping-ng/statping-ng/releases/latest"
contents, _, err := utils.HttpRequest(url, "GET", nil, nil, nil, time.Duration(2*time.Second), true, nil) contents, _, err := utils.HttpRequest(url, "GET", nil, nil, nil, time.Duration(2*time.Second), true, nil)
if err != nil { if err != nil {
return githubResponse{}, err return githubResponse{}, err

2
doc.go
View File

@ -21,4 +21,4 @@
// docker run -it -p 8080:8080 statping/statping // docker run -it -p 8080:8080 statping/statping
// //
// Enjoy Statping and tell me any issues you might be having on Github. https://github.com/adamboutcher // Enjoy Statping and tell me any issues you might be having on Github. https://github.com/adamboutcher
package statping package statping-ng

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/adamboutcher/statping-ng module github.com/statping-ng/statping-ng
// +heroku goVersion go1.14 // +heroku goVersion go1.14
go 1.14 go 1.14

2
go.sum
View File

@ -585,7 +585,7 @@ github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs=
github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw= github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw=
github.com/statping/emails v1.0.0 h1:90hGweEhr8wIFiy34KCkiFqGJlkug2gAQLVR6oSCFNU= github.com/statping/emails v1.0.0 h1:90hGweEhr8wIFiy34KCkiFqGJlkug2gAQLVR6oSCFNU=
github.com/statping/emails v1.0.0/go.mod h1:xFU85jXaiWQadqHqu/jDrGsAn6WPSk1WgKyTVuFm0TI= github.com/statping/emails v1.0.0/go.mod h1:xFU85jXaiWQadqHqu/jDrGsAn6WPSk1WgKyTVuFm0TI=
github.com/statping/statping v0.90.64/go.mod h1:lbyNPB73IjWtnommV4wSejYfgUT1yLhhqelMjl1ZBb8= github.com/statping-ng/statping-ng v0.90.64/go.mod h1:lbyNPB73IjWtnommV4wSejYfgUT1yLhhqelMjl1ZBb8=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

6
install.sh
View File

@ -12,7 +12,7 @@ cyan="\033[36m"
white="\033[37m" white="\033[37m"
gpg_key=64B9C6AAE2D55278 gpg_key=64B9C6AAE2D55278
gpgurl=https://statping.com/statping.gpg gpgurl=https://statping.com/statping.gpg
repo=https://github.com/adamboutcher/statping-ng repo=https://github.com/statping-ng/statping-ng
statping_get_tarball() { statping_get_tarball() {
fext='tar.gz' fext='tar.gz'
@ -55,9 +55,9 @@ statping_brew_install() {
if [[ -z "$(command -v brew --version)" ]]; then if [[ -z "$(command -v brew --version)" ]]; then
printf "${white}Using Brew to install!$reset\n" printf "${white}Using Brew to install!$reset\n"
printf "${yellow}---> brew tap statping/statping$reset\n" printf "${yellow}---> brew tap statping/statping$reset\n"
brew tap statping/statping brew tap statping-ng/statping-ng
printf "${yellow}---> brew install statping$reset\n" printf "${yellow}---> brew install statping$reset\n"
brew install statping brew install statping-ng
printf "${green}Brew installation is complete!$reset\n" printf "${green}Brew installation is complete!$reset\n"
printf "${yellow}You can use 'brew upgrade' to upgrade Statping next time.$reset\n" printf "${yellow}You can use 'brew upgrade' to upgrade Statping next time.$reset\n"
else else

2
types/doc.go
View File

@ -1,4 +1,4 @@
// Package types contains all of the structs for objects in Statping including services, hits, failures, Core, and others. // Package types contains all of the structs for objects in Statping including services, hits, failures, Core, and others.
// //
// More info on: https://github.com/statping/statping // More info on: https://github.com/statping-ng/statping-ng
package types package types

2
types/services/samples.go
View File

@ -83,7 +83,7 @@ func Samples() error {
s2 := &Service{ s2 := &Service{
Name: "Statping Github", Name: "Statping Github",
Domain: "https://github.com/statping/statping", Domain: "https://github.com/statping-ng/statping-ng",
ExpectedStatus: 200, ExpectedStatus: 200,
Interval: 30, Interval: 30,
Type: "http", Type: "http",

2
types/services/services_test.go
View File

@ -595,7 +595,7 @@ services:
<<: *tcpservice <<: *tcpservice
- name: Statping Github - name: Statping Github
domain: https://github.com/statping/statping domain: https://github.com/statping-ng/statping-ng
<<: *httpservice` <<: *httpservice`
err := utils.SaveFile(utils.Directory+"/services.yml", []byte(file)) err := utils.SaveFile(utils.Directory+"/services.yml", []byte(file))

2
utils/utils_test.go
View File

@ -34,7 +34,7 @@ func TestInitLogs(t *testing.T) {
} }
func TestDir(t *testing.T) { func TestDir(t *testing.T) {
assert.Contains(t, Directory, "statping/statping") assert.Contains(t, Directory, "statping-ng/statping-ng")
} }
func TestCommand(t *testing.T) { func TestCommand(t *testing.T) {