public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cherry-pick afaefd4

Browse Source
This commit is contained in:
Kevin Minehart
2023-05-08 14:40:24 -05:00
parent b1e51ffefd
commit 7ef26b4f65
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+6 -1
View File
@@ -2093,6 +2093,7 @@ steps:
- cp grabpl.exe C:\App\grabpl.exe - cp grabpl.exe C:\App\grabpl.exe
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
main
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
depends_on: depends_on:
- clone - clone
@@ -2766,6 +2767,7 @@ steps:
- cp grabpl.exe C:\App\grabpl.exe - cp grabpl.exe C:\App\grabpl.exe
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
${DRONE_TAG}
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
depends_on: depends_on:
- clone - clone
@@ -3405,6 +3407,7 @@ steps:
- cp grabpl.exe C:\App\grabpl.exe - cp grabpl.exe C:\App\grabpl.exe
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
${DRONE_TAG}
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
depends_on: depends_on:
- clone - clone
@@ -5321,6 +5324,7 @@ steps:
- cp grabpl.exe C:\App\grabpl.exe - cp grabpl.exe C:\App\grabpl.exe
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
$$env:DRONE_BRANCH
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
depends_on: depends_on:
- clone - clone
@@ -6223,6 +6227,7 @@ steps:
- cp grabpl.exe C:\App\grabpl.exe - cp grabpl.exe C:\App\grabpl.exe
- rm -force grabpl.exe - rm -force grabpl.exe
- C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise
$$env:DRONE_BRANCH
- cp C:\App\grabpl.exe grabpl.exe - cp C:\App\grabpl.exe grabpl.exe
depends_on: depends_on:
- clone - clone
@@ -7132,6 +7137,6 @@ kind: secret
name: enterprise2_security_prefix name: enterprise2_security_prefix
--- ---
kind: signature kind: signature
hmac: c652dce93a941da249e7bc35c00df998397376344b8ae1a8b6a208a58d557d79 hmac: 74ad678d3464d93940caf2abd1ac10494c9f3e3208383ec2e0bb686cfa9848b2
... ...
scripts/drone/steps/lib.star
+2 -2
View File
@@ -230,7 +230,7 @@ def windows_init_enterprise_steps(ver_mode):
"rm -r -force grafana-enterprise", "rm -r -force grafana-enterprise",
"cp grabpl.exe C:\\App\\grabpl.exe", "cp grabpl.exe C:\\App\\grabpl.exe",
"rm -force grabpl.exe", "rm -force grabpl.exe",
"C:\\App\\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\\App\\grafana-enterprise", "C:\\App\\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\\App\\grafana-enterprise {}".format(source),
"cp C:\\App\\grabpl.exe grabpl.exe", "cp C:\\App\\grabpl.exe grabpl.exe",
] ]
@@ -1403,7 +1403,7 @@ def get_windows_steps(edition, ver_mode):
"rm -r -force grafana-enterprise", "rm -r -force grafana-enterprise",
"cp grabpl.exe C:\\App\\grabpl.exe", "cp grabpl.exe C:\\App\\grabpl.exe",
"rm -force grabpl.exe", "rm -force grabpl.exe",
"C:\\App\\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\\App\\grafana-enterprise", "C:\\App\\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\\App\\grafana-enterprise {}".format(source),
"cp C:\\App\\grabpl.exe grabpl.exe", "cp C:\\App\\grabpl.exe grabpl.exe",
] ]