Commit d0ea98f6 by Brian Gann Committed by Torkel Ödegaard

Build: Support publishing MSI to grafana.com (#17073)

* add test for msi, and support for publishing msi
* update arch and os in test
* Build: Fixed issues with os naming
parent d8280b89
...@@ -174,6 +174,11 @@ var completeBuildArtifactConfigurations = []buildArtifact{ ...@@ -174,6 +174,11 @@ var completeBuildArtifactConfigurations = []buildArtifact{
arch: "amd64", arch: "amd64",
urlPostfix: ".windows-amd64.zip", urlPostfix: ".windows-amd64.zip",
}, },
{
os: "win-installer",
arch: "amd64",
urlPostfix: ".windows-amd64.msi",
},
} }
type artifactFilter struct { type artifactFilter struct {
......
...@@ -74,6 +74,34 @@ func TestPreparingReleaseFromRemote(t *testing.T) { ...@@ -74,6 +74,34 @@ func TestPreparingReleaseFromRemote(t *testing.T) {
baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana", baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"linux", "armv6", "_armhf.deb", "-rpi"}}, buildArtifacts: []buildArtifact{{"linux", "armv6", "_armhf.deb", "-rpi"}},
}, },
{
version: "v5.4.0-pre1asdf",
expectedVersion: "5.4.0-pre1asdf",
whatsNewURL: "https://whatsnews.foo/",
relNotesURL: "https://relnotes.foo/",
nightly: true,
expectedBeta: false,
expectedStable: false,
expectedArch: "amd64",
expectedOs: "win-installer",
expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.windows-amd64.msi",
baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"win-installer", "amd64", ".windows-amd64.msi", ""}},
},
{
version: "v5.4.0-pre1asdf",
expectedVersion: "5.4.0-pre1asdf",
whatsNewURL: "https://whatsnews.foo/",
relNotesURL: "https://relnotes.foo/",
nightly: true,
expectedBeta: false,
expectedStable: false,
expectedArch: "amd64",
expectedOs: "win",
expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.windows-amd64.zip",
baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"win", "amd64", ".windows-amd64.zip", ""}},
},
} }
for _, test := range cases { for _, test := range cases {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment