root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 90 Packages Projects Releases Wiki Activity

Remove git reset - replace with git stash (#40669)

This commit is contained in:
Dimitris Sotirakis 2021-10-20 11:39:46 +03:00 committed by GitHub
parent 7f8a01aa7d
commit ba60bec11b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.drone.yml
View File

@ -125,7 +125,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -136,6 +138,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -404,7 +408,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -415,6 +421,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -866,7 +874,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -877,6 +887,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -1252,7 +1264,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -1263,6 +1277,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -1812,7 +1828,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -1823,6 +1841,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -2187,7 +2207,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -2198,6 +2220,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -2742,7 +2766,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -2753,6 +2779,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -3089,7 +3117,9 @@ steps:
name: validate-scuemata name: validate-scuemata
- commands: - commands:
- '# Make sure the git tree is clean.' - '# Make sure the git tree is clean.'
- git reset --hard - '# Stashing changes, since packages that were produced in build-backend step are
needed.'
- git stash
- ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .
- '# The above command generates Typescript files (*.gen.ts) from all appropriate - '# The above command generates Typescript files (*.gen.ts) from all appropriate
.cue files.' .cue files.'
@ -3100,6 +3130,8 @@ steps:
- '# If any filenames are emitted by the below script, run the generator command - '# If any filenames are emitted by the below script, run the generator command
`grafana-cli cue gen-ts` locally and commit the result.' `grafana-cli cue gen-ts` locally and commit the result.'
- ./scripts/clean-git-or-error.sh - ./scripts/clean-git-or-error.sh
- '# Un-stash changes.'
- git stash pop
depends_on: depends_on:
- validate-scuemata - validate-scuemata
image: grafana/build-container:1.4.3 image: grafana/build-container:1.4.3
@ -3497,6 +3529,6 @@ kind: secret
name: drone_token name: drone_token
--- ---
kind: signature kind: signature
hmac: a6afb9baae7ecf011d368d43870c625c727d8604563a6daae0c76fac94762886 hmac: 96d23b144a0a27bce871f7faf782827c17cc132492fe058a7c56768c543078c9
... ...

5
scripts/drone/steps/lib.star
View File

@ -1011,7 +1011,8 @@ def ensure_cuetsified_step():
], ],
'commands': [ 'commands': [
'# Make sure the git tree is clean.', '# Make sure the git tree is clean.',
'git reset --hard', '# Stashing changes, since packages that were produced in build-backend step are needed.',
'git stash',
'./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .', './bin/linux-amd64/grafana-cli cue gen-ts --grafana-root .',
'# The above command generates Typescript files (*.gen.ts) from all appropriate .cue files.', '# The above command generates Typescript files (*.gen.ts) from all appropriate .cue files.',
'# It is required that the generated Typescript be in sync with the input CUE files.', '# It is required that the generated Typescript be in sync with the input CUE files.',
@ -1019,5 +1020,7 @@ def ensure_cuetsified_step():
'./node_modules/.bin/eslint . --ext .gen.ts --fix', './node_modules/.bin/eslint . --ext .gen.ts --fix',
'# If any filenames are emitted by the below script, run the generator command `grafana-cli cue gen-ts` locally and commit the result.', '# If any filenames are emitted by the below script, run the generator command `grafana-cli cue gen-ts` locally and commit the result.',
'./scripts/clean-git-or-error.sh', './scripts/clean-git-or-error.sh',
'# Un-stash changes.',
'git stash pop',
], ],
} }