MSI Installer by morochena · Pull Request #334 · manifoldco/torus-cli

morochena · 2017-12-07T19:21:04Z

Uses go-msi to generate a .msi installer for windows, and allows for distribution via chocolately.

ianlivingstone

Overall this looks good, the thing we need to think about is how this fits into the current build/package/upload process we take during a release.

Today, it's all done locally through the Makefile via the release-all target.

In future, I think this will probably need to be done separetely, on *nix for releasing the linux/macosx and then on a separate machine for windows.

Ideally, we can figure out how to do the releasing component securely via appveyor then this can just be done on build of a release tag by appveyor.

For now, I've left some comments throughout the PR to kick off a few discussions around how to get this into mergable shape. I think our best bet is to create a new target in the Makefile for bootstrapping locally (e.g. get go-msi and wix installed) on windows and another for actually building and packaging up the msi.

Thoughts?

ianlivingstone · 2017-12-12T17:40:28Z

appveyor.yml

 install:
+  # wix setup
+  - set PATH=%WIX%\bin;%PATH%
+  # go-msi install - static link method


I wonder if these should be in a bootstrap-windows component of the Makefile?

Agreed, I'll add mingw32-make to appveyor so we're able to use the Makefile in appveyor.yml.

ianlivingstone · 2017-12-12T18:00:07Z

appveyor.yml


 build_script:
  - c:\gopath\bin\dep.exe ensure
+  - go build -o torus.exe


Hmm, we're probably going to have to separate out building the windows binary (and now the installer + uploading it) from the rest of the Makefile when we build a release through make release-all.

If you want to introduce a make msi that requires the os to be windows and for wix/go-msi to be available (if possible) then I think we can open another issue (or subsequent PR) that has the changes to actually separately build, package, and upload a windows release.

I introduced an initial make msi that checks for go-msi, but I'll add os detection and hook it into the appveyor.yml.

ianlivingstone · 2017-12-12T18:02:04Z

packaging/msi/templates/product.wxs

+               <Component Id="ApplicationFiles" Guid="{{.Files.GUID}}">
+                  {{range $i, $e := .Files.Items}}
+                    <File Id="ApplicationFile{{$i}}" Source="{{$e}}"/>
+                    <!--


We can remove this right? Since we're not installing it as a service?

ianlivingstone · 2017-12-12T18:07:20Z

packaging/msi/templates/product.wxs

+
+      <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
+
+      <Upgrade Id="{{.UpgradeCode}}">


This is just a rule for forcing the upgrade of Torus right? Is there a way we can run a command at the same time?

When we upgrade an existing install we should also restart the daemon via torus daemon stop. Ideally we also tell them that after upgrading they will need to log into Torus again via the command prompt (or whichever shell they use).

ianlivingstone · 2017-12-12T18:09:13Z

wix.json

+  "product": "torus",
+  "company": "manifoldco",
+  "license": "LICENSE.md",
+  "version": "0.0.1",


This is the version of the binary right? Ideally this file can be tempalted like package.json inside packaging/npm which is then filled in prior to packaging.

This way we can pull the correct version in as well.

ianlivingstone · 2017-12-12T18:09:23Z

wix.json

+  "company": "manifoldco",
+  "license": "LICENSE.md",
+  "version": "0.0.1",
+  "upgrade-code": "8615055C-D8E0-404C-93BE-441C503BA6F0",


What sets this upgrade code?

$ go-msi set-guid generates them

ianlivingstone · 2017-12-12T18:37:02Z

packaging/msi/templates/choco/LICENSE.txt

@@ -0,0 +1,9 @@
+From: {{.Choco.LicenseURL}}


Thinking a bit about this, for now it's probably easiest just to get the wix support into the build pipeline so we're producing and uploading a real msi installer, then come back to thinking about Choco support.

Thoughts?

Sounds good, I'll remove the Chocolatey artifacts for now.

added msi target to makefile

- msi make target - bootstrap-windows make target - removed chocolatey packaging - updated appveyor.yml to use makefile uncommented upgrade code

added msi target to makefile

- msi make target - bootstrap-windows make target - removed chocolatey packaging - updated appveyor.yml to use makefile

ianlivingstone · 2017-12-18T15:40:12Z

packaging/msi/templates/choco/pkg.nuspec

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>


We don't need these templates for choco right?

ianlivingstone · 2017-12-18T15:49:46Z

Makefile

+# Generate Windows .msi 
+#################################################
+
+msi: binary 


I think this should depend on the release-binary-windows rule? This way it also gets put inside the builds/ directory. The subsequent msi should probably also be placed there as well, so it gets deleted on make clean.

ianlivingstone

Just two changes:

See if we can depend on binary-windows for building the binaries and having them populated into the builds/ folder.
The templates for choco should probably be removed as nothing will be using them right now.

Otherwise this looks great! Once we've resolved those two points and we've rebased this onto master, this is ready for merge :)

- msi target now relies on release-binary - msi target outputs to builds folder - wix.json relies on torus.exe existing in builds folder

…installer

AppVeyorBot · 2017-12-18T20:40:47Z

❌ Build torus-cli 400 failed (commit d7c612ed5e by @morochena)

AppVeyorBot · 2017-12-19T00:26:19Z

✅ Build torus-cli 409 completed (commit 64ae3225fa by @morochena)

ianlivingstone · 2017-12-19T14:04:48Z

wix.json

@@ -0,0 +1,30 @@
+{


This shouldn't be checked in right as it's a templated file?

morochena force-pushed the windows-installer branch from c4ffbe0 to 1297ad1 Compare December 8, 2017 13:28

ianlivingstone suggested changes Dec 12, 2017

View reviewed changes

morochena added 4 commits December 13, 2017 20:00

msi installer

c847afb

added msi target to makefile

applying suggestions for merge

0094f17

- msi make target - bootstrap-windows make target - removed chocolatey packaging - updated appveyor.yml to use makefile uncommented upgrade code

msi installer

570b606

added msi target to makefile

applying suggestions for merge

11d49f0

- msi make target - bootstrap-windows make target - removed chocolatey packaging - updated appveyor.yml to use makefile

morochena force-pushed the windows-installer branch from 1297ad1 to 11d49f0 Compare December 14, 2017 01:09

ianlivingstone reviewed Dec 18, 2017

View reviewed changes

ianlivingstone suggested changes Dec 18, 2017

View reviewed changes

morochena added 4 commits December 18, 2017 15:14

deleted choco artifacts

b53cfec

adjusting msi target

b877156

- msi target now relies on release-binary - msi target outputs to builds folder - wix.json relies on torus.exe existing in builds folder

Merge branch 'master' into windows-installer

2de525b

Merge remote-tracking branch 'origin/windows-installer' into windows-…

ad558fc

…installer

morochena added 8 commits December 18, 2017 15:41

moved go version back to 1.9.1

e50adc3

zip binary in appveyor

c06ac30

added conditional to use hashdeep instead of shasum for windows

db46c5d

testing uname

24af3ee

switch conditional to check for appveyor environment

d732b97

fixed version in go-msi make argument

c04667a

fixed version in go-msi make argument

e5e687f

moved go version back to 1.9.1

ef359be

ianlivingstone reviewed Dec 19, 2017

View reviewed changes

wix.json Outdated

@@ -0,0 +1,30 @@

{

Copy link

Contributor

ianlivingstone Dec 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be checked in right as it's a templated file?

removed wix.json

99f7d67

ianlivingstone approved these changes Dec 19, 2017

View reviewed changes

ianlivingstone merged commit 21350a3 into manifoldco:master Dec 19, 2017

This was referenced Dec 19, 2017

Create a .msi installer for Windows. #212

Closed

Automate releasing the msi installer #340

Open


		<Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>

		<Upgrade Id="{{.UpgradeCode}}">

Conversation

morochena commented Dec 7, 2017

Uh oh!

ianlivingstone left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ianlivingstone left a comment

Choose a reason for hiding this comment

Uh oh!

AppVeyorBot commented Dec 18, 2017

Uh oh!

AppVeyorBot commented Dec 19, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants