Merge remote-tracking branch 'origin' into km/test-tag-build

also install bash
2025-12-21 03:54:29 +08:00 · 2023-06-12 12:08:12 -05:00 · 2023-06-08 11:42:05 -05:00 · 2023-06-08 11:41:07 -05:00 · 2023-06-08 11:32:09 -05:00
2 changed files with 10 additions and 1 deletions
--- a/scripts/drone/rgm.star
+++ b/scripts/drone/rgm.star
@@ -43,7 +43,7 @@ def rgm_build(script = "drone_publish_main.sh"):
        "image": "golang:1.20.3-alpine",
        "commands": [
            # the docker program is a requirement for running dagger programs
-            "apk update && apk add docker",
+            "apk update && apk add docker bash",
            "export GRAFANA_DIR=$$(pwd)",
            "cd rgm && ./scripts/{}".format(script),
        ],
--- a/scripts/list-release-artifacts.sh
+++ b/scripts/list-release-artifacts.sh
@@ -3,6 +3,7 @@ set -e
 VERSION="${1:-v9.5.2}"
 ERSION="${VERSION#*v}"
 ERSION_DEB=`echo ${ERSION} | sed 's/-/~/g'`
 ASSETS=$(cat << EOF
 gs://${BUCKET}/artifacts/static-assets/grafana-oss/${ERSION}/public/robots.txt
@@ -42,6 +43,14 @@ gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana_${ERSION}_arm6
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana_${ERSION}_arm64.deb.sha256
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana_${ERSION}_armhf.deb
 gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana_${ERSION}_armhf.deb.sha256
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2-${ERSION}.linux-amd64.tar.gz
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2-${ERSION}.linux-amd64.tar.gz.sha256
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2-${ERSION}.linux-amd64-musl.tar.gz
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2-${ERSION}.linux-amd64-musl.tar.gz.sha256
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2_${ERSION_DEB}.amd64.deb
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2_${ERSION_DEB}.amd64.deb.sha256
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2-${ERSION_DEB}-1.x86_64.rpm
 gs://${BUCKET}/artifacts/downloads-enterprise2/${VERSION}/enterprise2/release/grafana-enterprise2-${ERSION_DEB}-1.x86_64.rpm.sha256
 gs://${BUCKET}/artifacts/downloads/${VERSION}/enterprise/release/grafana-enterprise-${ERSION}-1.aarch64.rpm
 gs://${BUCKET}/artifacts/downloads/${VERSION}/enterprise/release/grafana-enterprise-${ERSION}-1.aarch64.rpm.sha256
 gs://${BUCKET}/artifacts/downloads/${VERSION}/enterprise/release/grafana-enterprise-${ERSION}-1.armhfp.rpm
Author	SHA1	Message	Date
Kevin Minehart	17397c7753	Merge remote-tracking branch 'origin' into km/test-tag-build	2023-06-12 12:08:12 -05:00
Kevin Minehart	f60ea178c5	also install bash	2023-06-08 11:42:05 -05:00
Kevin Minehart	afa018762f	also install bash	2023-06-08 11:41:07 -05:00
Kevin Minehart	b9deb999a1	Add enterprise2 in list-release-artifacts	2023-06-08 11:32:09 -05:00