summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClement Tsang <34804052+ClementTsang@users.noreply.github.com>2020-08-22 20:22:47 -0400
committerGitHub <noreply@github.com>2020-08-22 20:22:47 -0400
commit397a7e846726ee0dca4047d3033567274d563e98 (patch)
tree7067e1cffa55f022e7a747d65ac1de1407893eb5
parent3252796f179e24f4b73b8eb8db52ef932f6e9bc7 (diff)
ci: Add winget template generation (#199)
Adds winget CI generation.
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml11
-rw-r--r--.vscode/settings.json3
-rw-r--r--Cargo.toml2
-rw-r--r--deployment/windows/winget/winget.yaml.template15
5 files changed, 31 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index ebe03da1..5a2a9a98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ rust-unmangle
.idea/
sample_configs/testing.toml
+
+# Wix
+/wix/
diff --git a/.travis.yml b/.travis.yml
index d4efa297..ff9a4d1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,12 @@ before_deploy:
zip bottom_i686-pc-windows-msvc.zip "btm.exe";
python "./deployment/windows/choco/choco_packager.py" "bottom_i686-pc-windows-msvc.zip" "bottom_x86_64-pc-windows-msvc.zip" $TRAVIS_TAG;
zip choco.zip "./deployment/windows/choco/bottom.nuspec" "./deployment/windows/choco/tools/";
+ choco install wixtoolset;
+ cargo install cargo-wix;
+ cargo wix init;
+ cargo wix;
+ cp "./target/wix/bottom*.msi" ./bottom_x86_64_installer.msi
+ python "./deployment/packager.py" "./bottom_x86_64_installer.msi" $TRAVIS_TAG "./deployment/windows/winget/winget.yaml.template", "$TRAVIS_TAG.yaml" "SHA256";
else
cargo build --release;
cp ./target/release/btm btm;
@@ -78,7 +84,6 @@ before_deploy:
elif [[ $TRAVIS_OS_NAME == "osx" ]]; then
tar -czvf bottom_x86_64-apple-darwin.tar.gz btm;
python "./deployment/packager.py" "./bottom_x86_64-apple-darwin.tar.gz" $TRAVIS_TAG "./deployment/macos/homebrew/bottom.rb.template", "./bottom.rb" "SHA256";
- tar -czvf homebrew.tar.gz bottom.rb;
fi
fi
@@ -93,8 +98,10 @@ deploy:
- bottom_*.zip
- bottom_*.deb
- arch.tar.gz
- - homebrew.tar.gz
+ - bottom.rb
- choco.zip
+ - bottom_x86_64_installer.msi
+ - $TRAVIS_TAG.yaml
skip_cleanup: true
on:
tags: true
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b64ae738..78825f33 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,6 +17,7 @@
"WASD",
"Wojnarowski",
"andys",
+ "choco",
"cmdline",
"crossterm",
"curr",
@@ -56,7 +57,9 @@
"vsize",
"whitespaces",
"winapi",
+ "winget",
"winnt",
+ "wixtoolset",
"xzvf",
"ytop"
]
diff --git a/Cargo.toml b/Cargo.toml
index ca04c114..e72f33e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,7 +58,7 @@ predicates = "1"
cargo-husky = "1"
[package.metadata.deb]
-section = "utils"
+section = "utility"
assets = [
["target/release/btm", "usr/bin/", "755"],
["LICENSE", "usr/share/doc/btm/", "644"],
diff --git a/deployment/windows/winget/winget.yaml.template b/deployment/windows/winget/winget.yaml.template
new file mode 100644
index 00000000..807aa38b
--- /dev/null
+++ b/deployment/windows/winget/winget.yaml.template
@@ -0,0 +1,15 @@
+Id: Clement.bottom
+Version: $version
+Name: bottom
+Publisher: Clement
+License: MIT
+AppMoniker: bottom
+Tags: tui, monitoring, terminal
+Description: Yet another cross-platform graphical process/system monitor.
+Homepage: https://github.com/ClementTsang/bottom
+Installers:
+ - Arch: x64
+ Url: https://github.com/ClementTsang/bottom/releases/download/$version/bottom-$version-x86_64.msi
+ Sha256: $hash
+ InstallerType: msi
+ \ No newline at end of file