IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-25 08:21:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Drone: remove flag from main downstream step (#50681)

Browse Source
This commit is contained in:
Agnès Toulet 2022-06-13 17:06:11 +02:00 committed by GitHub
parent 95a4c4a4d6
commit 3e5e86d926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.drone.yml
View File

@ -912,7 +912,6 @@ steps:
params: params:
- SOURCE_BUILD_NUMBER=${DRONE_COMMIT} - SOURCE_BUILD_NUMBER=${DRONE_COMMIT}
- SOURCE_COMMIT=${DRONE_COMMIT} - SOURCE_COMMIT=${DRONE_COMMIT}
- OSS_PULL_REQUEST=${DRONE_PULL_REQUEST}
repositories: repositories:
- grafana/grafana-enterprise@main - grafana/grafana-enterprise@main
server: https://drone.grafana.net server: https://drone.grafana.net
@ -4683,6 +4682,6 @@ kind: secret
name: gcp_upload_artifacts_key name: gcp_upload_artifacts_key
--- ---
kind: signature kind: signature
hmac: df6f9fbc1fe40e3ecad762194eeb466ded8aa92cc0ee13a77ea5142d9a3a4749 hmac: 5f90961f151491580770a354e6f60ceddf35557f1094ec0ee94369fe52285697
... ...

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

@ -206,13 +206,13 @@ def enterprise_downstream_step(edition, ver_mode):
'params': [ 'params': [
'SOURCE_BUILD_NUMBER=${DRONE_COMMIT}', 'SOURCE_BUILD_NUMBER=${DRONE_COMMIT}',
'SOURCE_COMMIT=${DRONE_COMMIT}', 'SOURCE_COMMIT=${DRONE_COMMIT}',
'OSS_PULL_REQUEST=${DRONE_PULL_REQUEST}',
], ],
}, },
} }
if ver_mode == 'pr': if ver_mode == 'pr':
step.update({ 'failure': 'ignore' }) step.update({ 'failure': 'ignore' })
step['settings']['params'].append('OSS_PULL_REQUEST=${DRONE_PULL_REQUEST}')
return step return step