IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: rgm-package must wait for update-package-json-version in main pip… (#77022)

Browse Source 
CI: rgm-package must wait for update-package-json-version in main pipeline
This commit is contained in:
Horst Gutmann 2023-10-24 10:52:14 +02:00 committed by GitHub
parent fbbc524cb6
commit bd2b4e956b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -1748,7 +1748,7 @@ steps:
--yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
> packages.txt > packages.txt
depends_on: depends_on:
- yarn-install - update-package-json-version
image: grafana/grafana-build:main image: grafana/grafana-build:main
name: rgm-package name: rgm-package
pull: always pull: always
@ -4607,6 +4607,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: a23a1640b21a7e8dd62089ab21b84a4efc43504cd6e956dd0f49e56df4f4e5a2 hmac: 93de8a710e23d3f1d31860f9eed34cd841b0a0eb48637971de4e8ce60a7c3df1
... ...

3
scripts/drone/pipelines/build.star
View File

@ -70,17 +70,18 @@ def build_e2e(trigger, ver_mode):
[ [
build_frontend_package_step(), build_frontend_package_step(),
enterprise_downstream_step(ver_mode = ver_mode), enterprise_downstream_step(ver_mode = ver_mode),
rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
], ],
) )
else: else:
build_steps.extend([ build_steps.extend([
update_package_json_version(), update_package_json_version(),
build_frontend_package_step(depends_on = ["update-package-json-version"]), build_frontend_package_step(depends_on = ["update-package-json-version"]),
rgm_package_step(depends_on = ["update-package-json-version"], distros = "linux/amd64,linux/arm64", file = "packages.txt"),
]) ])
build_steps.extend( build_steps.extend(
[ [
rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
grafana_server_step(), grafana_server_step(),
e2e_tests_step("dashboards-suite"), e2e_tests_step("dashboards-suite"),
e2e_tests_step("smoke-tests-suite"), e2e_tests_step("smoke-tests-suite"),

4
scripts/drone/steps/rgm.star
View File

@ -9,12 +9,12 @@ load(
) )
# rgm_package_step will create a tar.gz for use in e2e tests or other PR testing related activities.. # rgm_package_step will create a tar.gz for use in e2e tests or other PR testing related activities..
def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"): def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt", depends_on = ["yarn-install"]):
return { return {
"name": "rgm-package", "name": "rgm-package",
"image": "grafana/grafana-build:main", "image": "grafana/grafana-build:main",
"pull": "always", "pull": "always",
"depends_on": ["yarn-install"], "depends_on": depends_on,
"commands": [ "commands": [
"/src/grafana-build package --distro={} ".format(distros) + "/src/grafana-build package --distro={} ".format(distros) +
"--go-version={} ".format(golang_version) + "--go-version={} ".format(golang_version) +