IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove tidy-check script (#31423)

Browse Source 
* Remove tidy-check script

* Update grabpl version to 0.5.43
This commit is contained in:
Dimitris Sotirakis 2021-02-23 17:53:30 +02:00 committed by GitHub
parent 1e7f2e93e6
commit c86eeae132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.drone.yml
View File

@ -17,7 +17,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -259,7 +259,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -591,7 +591,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone - .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
@ -641,7 +641,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
environment: environment:
@ -726,7 +726,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl verify-version ${DRONE_TAG}
@ -1033,7 +1033,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone - .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
@ -1084,7 +1084,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -1474,7 +1474,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/windows/grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
- git checkout ${DRONE_TAG} - git checkout ${DRONE_TAG}
@ -1540,7 +1540,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl verify-version ${DRONE_TAG}
@ -1645,7 +1645,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl verify-version v7.3.0-test
@ -1941,7 +1941,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone - .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
@ -1992,7 +1992,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -2376,7 +2376,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/windows/grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
- git checkout master - git checkout master
@ -2442,7 +2442,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl verify-version v7.3.0-test
@ -2547,7 +2547,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -2818,7 +2818,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/windows/grabpl.exe -OutFile grabpl.exe
- .\grabpl.exe verify-drone - .\grabpl.exe verify-drone
- name: build-windows-installer - name: build-windows-installer
@ -2865,7 +2865,7 @@ steps:
image: grafana/build-container:1.3.2 image: grafana/build-container:1.3.2
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -3252,7 +3252,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.42/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/windows/grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
- git checkout $$env:DRONE_BRANCH - git checkout $$env:DRONE_BRANCH

8
Makefile
View File

@ -4,7 +4,7 @@
-include local/Makefile -include local/Makefile
.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go revive golangci-lint tidy-check test-go test-js test run run-frontend clean devenv devenv-down revive-strict protobuf help .PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go revive golangci-lint test-go test-js test run run-frontend clean devenv devenv-down revive-strict protobuf help
GO = GO111MODULE=on go GO = GO111MODULE=on go
GO_FILES ?= ./pkg/... GO_FILES ?= ./pkg/...
@ -95,11 +95,7 @@ golangci-lint: scripts/go/bin/golangci-lint
--config ./scripts/go/configs/.golangci.toml \ --config ./scripts/go/configs/.golangci.toml \
$(GO_FILES) $(GO_FILES)
tidy-check: lint-go: golangci-lint revive revive-strict # Run all code checks for backend.
@echo "check whether go.mod and go.sum are consistent"
@scripts/tidy-check.sh
lint-go: golangci-lint revive revive-strict tidy-check # Run all code checks for backend.
# with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
shellcheck: $(SH_FILES) ## Run checks for shell scripts. shellcheck: $(SH_FILES) ## Run checks for shell scripts.

2
scripts/lib.star
View File

@ -1,4 +1,4 @@
grabpl_version = '0.5.42' grabpl_version = '0.5.43'
build_image = 'grafana/build-container:1.3.2' build_image = 'grafana/build-container:1.3.2'
publish_image = 'grafana/grafana-ci-deploy:1.3.1' publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'

35
scripts/tidy-check.sh
View File

@ -1,35 +0,0 @@
#!/bin/bash
set -eo pipefail
# Verify that Go is properly installed and available
command -v go >/dev/null 2>&1 || { echo 'please install Go or use an image that has it'; exit 1; }
backup_go_mod_files()
{
mod=$(mktemp)
cp go.mod "$mod"
sum=$(mktemp)
cp go.sum "$sum"
}
restore_go_mod_files()
{
cp "$mod" go.mod
rm "$mod"
cp "$sum" go.sum
rm "$sum"
}
# Backup current go.mod and go.sum files
backup_go_mod_files
# Defer the go.mod and go.sum files backup recovery
trap restore_go_mod_files EXIT
# Tidy go.mod and go.sum files
go mod tidy
diff "$mod" go.mod || { echo "your go.mod is inconsistent"; exit 1; }
diff "$sum" go.sum || { echo "your go.sum is inconsistent"; exit 1; }