From d0ea98f6bd8087bfaae5d9deb72753f5596ece8c Mon Sep 17 00:00:00 2001 From: Brian Gann Date: Wed, 15 May 2019 03:58:25 -0500 Subject: [PATCH] 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 --- scripts/build/release_publisher/publisher.go | 5 ++++ .../build/release_publisher/publisher_test.go | 28 +++++++++++++++++++ ...enterprise-5.4.0-123pre1.windows-amd64.msi | 0 ...ise-5.4.0-123pre1.windows-amd64.msi.sha256 | 1 + 4 files changed, 34 insertions(+) create mode 100644 scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi create mode 100644 scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256 diff --git a/scripts/build/release_publisher/publisher.go b/scripts/build/release_publisher/publisher.go index c0d62724a4e..da4d36e49d5 100644 --- a/scripts/build/release_publisher/publisher.go +++ b/scripts/build/release_publisher/publisher.go @@ -174,6 +174,11 @@ var completeBuildArtifactConfigurations = []buildArtifact{ arch: "amd64", urlPostfix: ".windows-amd64.zip", }, + { + os: "win-installer", + arch: "amd64", + urlPostfix: ".windows-amd64.msi", + }, } type artifactFilter struct { diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go index 80d2cd477a4..7406eef74b6 100644 --- a/scripts/build/release_publisher/publisher_test.go +++ b/scripts/build/release_publisher/publisher_test.go @@ -74,6 +74,34 @@ func TestPreparingReleaseFromRemote(t *testing.T) { baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana", 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 { diff --git a/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi b/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi new file mode 100644 index 00000000000..e69de29bb2d diff --git a/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256 b/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256 new file mode 100644 index 00000000000..c3068040269 --- /dev/null +++ b/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256 @@ -0,0 +1 @@ +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855