From 4c9bdef98dcfb24d8d24dac8117c9d3feb921a06 Mon Sep 17 00:00:00 2001 From: dsotirakis Date: Wed, 26 Jul 2023 09:54:59 +0300 Subject: [PATCH] Fix deb/rpm (cherry picked from commit c3ebd388e3cc192590c3f4d381429f7d9e345765) --- .drone.yml | 6 +++--- scripts/drone/steps/lib.star | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 26f32bbebcb..aeb59b3879c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2989,7 +2989,7 @@ steps: from_secret: packages_gpg_private_key gpg_public_key: from_secret: packages_gpg_public_key - package_path: gs://grafana-prerelease/artifacts/downloads/*$${DRONE_TAG}/oss/**.deb + package_path: gs://grafana-prerelease/artifacts/downloads/*${DRONE_TAG}/oss/**.deb secret_access_key: from_secret: packages_secret_access_key service_account_json: @@ -3010,7 +3010,7 @@ steps: from_secret: packages_gpg_private_key gpg_public_key: from_secret: packages_gpg_public_key - package_path: gs://grafana-prerelease/artifacts/downloads/*$${DRONE_TAG}/oss/**.rpm + package_path: gs://grafana-prerelease/artifacts/downloads/*${DRONE_TAG}/oss/**.rpm secret_access_key: from_secret: packages_secret_access_key service_account_json: @@ -4612,6 +4612,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: fcf3c6f58b564b3ca60bb9ba1d5c9e6dd167f2661e591f3c37c0f32a3ec9df3e +hmac: ce9379008ab3dd7aebcbedbe7c92bf42751defb137f4785076767688cc3b402b ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index d9bc3c320fb..8517896a8ec 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1183,7 +1183,7 @@ def publish_linux_packages_step(package_manager = "deb"): "gpg_passphrase": from_secret("packages_gpg_passphrase"), "gpg_public_key": from_secret("packages_gpg_public_key"), "gpg_private_key": from_secret("packages_gpg_private_key"), - "package_path": "gs://grafana-prerelease/artifacts/downloads/*$${{DRONE_TAG}}/oss/**.{}".format( + "package_path": "gs://grafana-prerelease/artifacts/downloads/*${{DRONE_TAG}}/oss/**.{}".format( package_manager, ), },