CI: Fix deb/rpm bug for linux package publishing (#72336)

Fix deb/rpm

(cherry picked from commit c3ebd388e3)
(cherry picked from commit 4c9bdef98d)

# Conflicts:
#	.drone.yml
This commit is contained in:
Dimitris Sotirakis 2023-07-26 14:18:00 +03:00 committed by GitHub
parent 488eac0e49
commit e3ec53b418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -3292,7 +3292,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:
@ -3313,7 +3313,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:
@ -4968,6 +4968,6 @@ kind: secret
name: delivery-bot-app-private-key
---
kind: signature
hmac: 171ee57a344cc5faf219415c40714ca928e96d135f54282da73cde6cb778478e
hmac: 5379326ce6bb3db880a951fc714d01b10f7382a7b7ec73510898fee53061008b
...

View File

@ -1245,7 +1245,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,
),
},