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

Make publish packages depend on compile-build-cmd and run from bin/build (#56713)

Browse Source
This commit is contained in:
Dimitris Sotirakis 2022-10-17 10:58:36 +03:00 committed by GitHub
parent c8402b4b50
commit e25475b9c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.drone.yml
View File

@ -1800,10 +1800,10 @@ steps:
image: alpine:3.15.6 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- ./bin/grabpl publish packages --edition oss --gcp-key /tmp/gcpkey.json --build-id - ./bin/build publish packages --edition oss --gcp-key /tmp/gcpkey.json --build-id
${DRONE_BUILD_NUMBER} ${DRONE_BUILD_NUMBER}
depends_on: depends_on:
- grabpl - compile-build-cmd
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
@ -3798,9 +3798,9 @@ steps:
image: golang:1.19.2 image: golang:1.19.2
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/grabpl publish packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG} - ./bin/build publish packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG}
depends_on: depends_on:
- grabpl - compile-build-cmd
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
@ -3887,10 +3887,9 @@ steps:
image: golang:1.19.2 image: golang:1.19.2
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/grabpl publish packages --edition enterprise --gcp-key /tmp/gcpkey.json - ./bin/build publish packages --edition enterprise --gcp-key /tmp/gcpkey.json ${DRONE_TAG}
${DRONE_TAG}
depends_on: depends_on:
- grabpl - compile-build-cmd
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
@ -5603,6 +5602,6 @@ kind: secret
name: packages_secret_access_key name: packages_secret_access_key
--- ---
kind: signature kind: signature
hmac: 50cfbb352e0423eab71db5ee255de891f5ce510de765ba4add2aa69267ddd65f hmac: ead459950183bdae94b7e670d6bb883f3ff01775294324c43813fde99553f57d
... ...

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

@ -988,12 +988,12 @@ def upload_packages_step(edition, ver_mode, trigger=None):
def publish_packages_step(edition, ver_mode): def publish_packages_step(edition, ver_mode):
if ver_mode == 'release': if ver_mode == 'release':
cmd = './bin/grabpl publish packages --edition {} --gcp-key /tmp/gcpkey.json ${{DRONE_TAG}}'.format( cmd = './bin/build publish packages --edition {} --gcp-key /tmp/gcpkey.json ${{DRONE_TAG}}'.format(
edition, edition,
) )
elif ver_mode == 'main': elif ver_mode == 'main':
build_no = '${DRONE_BUILD_NUMBER}' build_no = '${DRONE_BUILD_NUMBER}'
cmd = './bin/grabpl publish packages --edition {} --gcp-key /tmp/gcpkey.json --build-id {}'.format( cmd = './bin/build publish packages --edition {} --gcp-key /tmp/gcpkey.json --build-id {}'.format(
edition, build_no, edition, build_no,
) )
else: else:
@ -1003,7 +1003,7 @@ def publish_packages_step(edition, ver_mode):
'name': 'publish-packages-{}'.format(edition), 'name': 'publish-packages-{}'.format(edition),
'image': publish_image, 'image': publish_image,
'depends_on': [ 'depends_on': [
'grabpl', 'compile-build-cmd',
], ],
'environment': { 'environment': {
'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'), 'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),