Merge 7279793d25 into release

.github/workflows/validate-install.yml

@@ -9,7 +9,6 @@ on:
 name: Validate Install
 
 jobs:
-
   package_linux_release:
     name: Package Linux Release
     runs-on: ubuntu-latest
@@ -20,7 +19,7 @@ jobs:
       - name: Make release
         uses: ./.github/actions/make-linux-release
         with:
-        version-number: '0.0.0'
+          version-number: "0.0.0"
           output-file: polaris.tar.gz
       - name: Upload packaged release
         uses: actions/upload-artifact@v2
@@ -55,7 +54,7 @@ jobs:
       - name: Make a request
         run: curl -f http://localhost:5050
       - name: Stop Polaris
-      run: sudo kill -KILL $(cat /usr/local/var/run/polaris/polaris.pid)
+        run: sudo kill -KILL $(sudo cat /usr/local/var/run/polaris/polaris.pid)
       - name: Uninstall
         run: sudo make uninstall
 
@@ -104,7 +103,7 @@ jobs:
       - name: Make release
         uses: ./.github/actions/make-windows-release
         with:
-        version-number: '0.0.0'
+          version-number: "0.0.0"
           output-file: polaris.msi
       - name: Upload packaged release
         uses: actions/upload-artifact@v2

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Polaris 0.14.2
+
+### Server
+
+- Fixed a startup error in Windows packaged builds
+
 ## Polaris 0.14.1
 
 ### Server

Cargo.lock

@@ -768,6 +768,19 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
+[[package]]
+name = "embed-resource"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e"
+dependencies = [
+ "cc",
+ "rustc_version 0.4.0",
+ "toml 0.5.11",
+ "vswhom",
+ "winreg",
+]
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.33"
@@ -1544,6 +1557,7 @@ dependencies = [
  "daemonize",
  "diesel",
  "diesel_migrations",
+ "embed-resource",
  "fs_extra",
  "futures-util",
  "getopts",
@@ -2458,6 +2472,26 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "vswhom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
+dependencies = [
+ "libc",
+ "vswhom-sys",
+]
+
+[[package]]
+name = "vswhom-sys"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -2674,6 +2708,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winres"
 version = "0.1.12"

Cargo.toml

@@ -74,6 +74,7 @@ daemonize = "0.5"
 sd-notify = "0.4.1"
 
 [target.'cfg(windows)'.build-dependencies]
+embed-resource = "1.8"
 winres = "0.1"
 
 [dev-dependencies]

build.rs

@@ -3,6 +3,7 @@ fn main() {
 	let mut res = winres::WindowsResource::new();
 	res.set_icon("./res/windows/application/icon_polaris_512.ico");
 	res.compile().unwrap();
+	embed_resource::compile("res/windows/application/polaris-manifest.rc");
 }
 
 #[cfg(unix)]

res/windows/application/polaris-manifest.rc

@@ -0,0 +1,2 @@
+#define RT_MANIFEST 24
+1 RT_MANIFEST "polaris.exe.manifest"

res/windows/application/polaris.exe.manifest

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="*"
+    name="app"
+    type="win32"
+/>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="*"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>