From c3ebd388e3cc192590c3f4d381429f7d9e345765 Mon Sep 17 00:00:00 2001 From: dsotirakis Date: Wed, 26 Jul 2023 09:54:59 +0300 Subject: [PATCH] Fix deb/rpm --- .drone.yml | 9 ++------- scripts/drone/steps/lib.star | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index c3f826f9182..8529ad40166 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2920,7 +2920,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: @@ -2941,7 +2941,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: @@ -4487,8 +4487,3 @@ get: path: infra/data/ci/github/grafanabot kind: secret name: github_token ---- -kind: signature -hmac: f6b35e423df93c4cbe13528ef3e8994259c66016dddf2a4d7873837e51011585 - -... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index f91d7ef3049..81919b98297 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1173,7 +1173,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, ), },