From 2c781d472a284f319db69a8bcc5e9a992653079b Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Thu, 6 Oct 2022 11:16:35 +0300 Subject: [PATCH] Change from grabpl to build for grafana-com (#56434) (#56443) (cherry picked from commit ec7d9e196e2cced2042e756962263b30832e3f8d) --- .drone.yml | 20 +++++++++++++++++--- scripts/drone/events/release.star | 2 ++ scripts/drone/steps/lib.star | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index ff2cc5ce93b..6a2046c78f2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3755,6 +3755,13 @@ steps: - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl +- commands: + - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd + depends_on: [] + environment: + CGO_ENABLED: 0 + image: golang:1.19.1 + name: compile-build-cmd - commands: - ./bin/grabpl publish packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG} depends_on: @@ -3773,7 +3780,7 @@ steps: image: grafana/grafana-ci-deploy:1.3.3 name: publish-packages-oss - commands: - - ./bin/grabpl publish grafana-com --edition oss ${DRONE_TAG} + - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} depends_on: - publish-packages-oss environment: @@ -3836,6 +3843,13 @@ steps: - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl +- commands: + - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd + depends_on: [] + environment: + CGO_ENABLED: 0 + image: golang:1.19.1 + name: compile-build-cmd - commands: - ./bin/grabpl publish packages --edition enterprise --gcp-key /tmp/gcpkey.json ${DRONE_TAG} @@ -3855,7 +3869,7 @@ steps: image: grafana/grafana-ci-deploy:1.3.3 name: publish-packages-enterprise - commands: - - ./bin/grabpl publish grafana-com --edition enterprise ${DRONE_TAG} + - ./bin/build publish grafana-com --edition enterprise ${DRONE_TAG} depends_on: - publish-packages-enterprise environment: @@ -5381,6 +5395,6 @@ kind: secret name: packages_secret_access_key --- kind: signature -hmac: f97c0e6742fbcb3c0369652bc1570242cf1083fb2b7fdac76b66f719ecd2b5e0 +hmac: e272666c636ef5a6c3961293d4a981e801c2e6823c3b8fcf63adad49b53ee32e ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index 51b4f137872..2f05e65df00 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -444,6 +444,7 @@ def publish_packages_pipeline(): } oss_steps = [ download_grabpl_step(), + compile_build_cmd(), publish_packages_step(edition='oss', ver_mode='release'), publish_grafanacom_step(edition='oss', ver_mode='release'), publish_linux_packages_step(edition='oss'), @@ -451,6 +452,7 @@ def publish_packages_pipeline(): enterprise_steps = [ download_grabpl_step(), + compile_build_cmd(), publish_packages_step(edition='enterprise', ver_mode='release'), publish_grafanacom_step(edition='enterprise', ver_mode='release'), publish_linux_packages_step(edition='enterprise'), diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 89bc5b2007b..edcb69ec74f 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -995,12 +995,12 @@ def publish_packages_step(edition, ver_mode): def publish_grafanacom_step(edition, ver_mode): if ver_mode == 'release': - cmd = './bin/grabpl publish grafana-com --edition {} ${{DRONE_TAG}}'.format( + cmd = './bin/build publish grafana-com --edition {} ${{DRONE_TAG}}'.format( edition, ) elif ver_mode == 'main': build_no = '${DRONE_BUILD_NUMBER}' - cmd = './bin/grabpl publish grafana-com --edition {} --build-id {}'.format( + cmd = './bin/build publish grafana-com --edition {} --build-id {}'.format( edition, build_no, ) else: