vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 7279793d25 into release

Browse source
This commit is contained in:
github-actions[bot] 2024-03-14 02:04:44 +00:00 • committed by GitHub
commit f7cd34bbbc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 167 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

187
.github/workflows/validate-install.yml vendored
View file

@ -9,24 +9,23 @@ on:
name: Validate Install name: Validate Install
jobs: jobs:
package_linux_release: package_linux_release:
name: Package Linux Release name: Package Linux Release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Polaris - name: Checkout Polaris
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Make release - name: Make release
uses: ./.github/actions/make-linux-release uses: ./.github/actions/make-linux-release
with: with:
version-number: '0.0.0' version-number: "0.0.0"
output-file: polaris.tar.gz output-file: polaris.tar.gz
- name: Upload packaged release - name: Upload packaged release
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: linux-release name: linux-release
path: polaris.tar.gz path: polaris.tar.gz
validate_linux_system_install: validate_linux_system_install:
name: Linux System Install name: Linux System Install
@ -34,30 +33,30 @@ jobs:
needs: package_linux_release needs: package_linux_release
steps: steps:
- name: Download release - name: Download release
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: linux-release name: linux-release
path: . path: .
- name: Extract release - name: Extract release
run: tar -xzvf polaris.tar.gz --strip-components=1 run: tar -xzvf polaris.tar.gz --strip-components=1
- name: Preview Install - name: Preview Install
run: make preview run: make preview
- name: Preview Install w/ Custom Prefix - name: Preview Install w/ Custom Prefix
run: make preview PREFIX=/some/random/prefix run: make preview PREFIX=/some/random/prefix
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
- name: Install - name: Install
run: sudo --preserve-env=PATH make install run: sudo --preserve-env=PATH make install
- name: Run Polaris - name: Run Polaris
run: sudo /usr/local/bin/polaris && sleep 5s run: sudo /usr/local/bin/polaris && sleep 5s
- name: Make a request - name: Make a request
run: curl -f http://localhost:5050 run: curl -f http://localhost:5050
- name: Stop Polaris - 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 - name: Uninstall
run: sudo make uninstall run: sudo make uninstall
validate_linux_xdg_install: validate_linux_xdg_install:
name: Linux XDG Install name: Linux XDG Install
@ -65,52 +64,52 @@ jobs:
needs: package_linux_release needs: package_linux_release
steps: steps:
- name: Download release - name: Download release
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: linux-release name: linux-release
path: . path: .
- name: Extract release - name: Extract release
run: tar -xzvf polaris.tar.gz --strip-components=1 run: tar -xzvf polaris.tar.gz --strip-components=1
- name: Preview Install - name: Preview Install
run: make preview-xdg run: make preview-xdg
- name: Preview Install w/ Custom XDG_DATA_HOME - name: Preview Install w/ Custom XDG_DATA_HOME
run: make preview-xdg XDG_DATA_HOME=/my/own/xdg/home run: make preview-xdg XDG_DATA_HOME=/my/own/xdg/home
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
- name: Install - name: Install
run: make install-xdg run: make install-xdg
- name: Run Polaris - name: Run Polaris
run: $HOME/.local/bin/polaris && sleep 5s run: $HOME/.local/bin/polaris && sleep 5s
- name: Make a request - name: Make a request
run: curl -f http://localhost:5050 run: curl -f http://localhost:5050
- name: Stop Polaris - name: Stop Polaris
run: kill -KILL $(cat /tmp/polaris-1001/polaris.pid) run: kill -KILL $(cat /tmp/polaris-1001/polaris.pid)
- name: Uninstall - name: Uninstall
run: make uninstall-xdg run: make uninstall-xdg
package_windows_release: package_windows_release:
name: Package Windows Release name: Package Windows Release
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- name: Checkout Polaris - name: Checkout Polaris
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Install Rust Toolchain - name: Install Rust Toolchain
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
- name: Make release - name: Make release
uses: ./.github/actions/make-windows-release uses: ./.github/actions/make-windows-release
with: with:
version-number: '0.0.0' version-number: "0.0.0"
output-file: polaris.msi output-file: polaris.msi
- name: Upload packaged release - name: Upload packaged release
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: windows-release name: windows-release
path: polaris.msi path: polaris.msi
validate_windows_install: validate_windows_install:
name: Windows Install name: Windows Install
@ -118,20 +117,20 @@ jobs:
needs: package_windows_release needs: package_windows_release
steps: steps:
- name: Download release - name: Download release
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: windows-release name: windows-release
path: . path: .
- name: Install - name: Install
run: msiexec /i polaris.msi /qn run: msiexec /i polaris.msi /qn
- name: Run Polaris - name: Run Polaris
run: | run: |
start $env:LOCALAPPDATA/Permafrost/Polaris/polaris-cli.exe start $env:LOCALAPPDATA/Permafrost/Polaris/polaris-cli.exe
sleep 5 sleep 5
- name: Make a request - name: Make a request
run: curl -f http://localhost:5050 run: curl -f http://localhost:5050
- name: Stop Polaris - name: Stop Polaris
run: taskkill /IM polaris-cli.exe run: taskkill /IM polaris-cli.exe
- name: Uninstall - name: Uninstall
run: msiexec /x polaris.msi /qn run: msiexec /x polaris.msi /qn

6
CHANGELOG.md
View file

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

43
Cargo.lock generated
View file

@ -768,6 +768,19 @@ version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" 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]] [[package]]
name = "encoding_rs" name = "encoding_rs"
version = "0.8.33" version = "0.8.33"
@ -1544,6 +1557,7 @@ dependencies = [
"daemonize", "daemonize",
"diesel", "diesel",
"diesel_migrations", "diesel_migrations",
"embed-resource",
"fs_extra", "fs_extra",
"futures-util", "futures-util",
"getopts", "getopts",
@ -2458,6 +2472,26 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" 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]] [[package]]
name = "wasi" name = "wasi"
version = "0.11.0+wasi-snapshot-preview1" version = "0.11.0+wasi-snapshot-preview1"
@ -2674,6 +2708,15 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "winreg"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
"winapi",
]
[[package]] [[package]]
name = "winres" name = "winres"
version = "0.1.12" version = "0.1.12"

1
Cargo.toml
View file

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

1
build.rs
View file

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

2
res/windows/application/polaris-manifest.rc Normal file
View file

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

21
res/windows/application/polaris.exe.manifest Normal file
View file

@ -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>