mirror of
https://github.com/ClementTsang/bottom
synced 2024-11-10 14:44:18 +00:00
bug/ci: fix debian file generation breaking completions (#645)
Fixes completion file generation being broken while the .deb file is made, due to using an incorrect path.
This commit is contained in:
parent
cf08f935dc
commit
c92cfc644d
3 changed files with 32 additions and 12 deletions
18
.github/workflows/deployment.yml
vendored
18
.github/workflows/deployment.yml
vendored
|
@ -326,10 +326,22 @@ jobs:
|
|||
with:
|
||||
key: x86_64-unknown-linux-gnu-deb
|
||||
|
||||
- name: Build Debian release (Linux x86-64 GNU)
|
||||
- name: Build
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: build
|
||||
args: --release --verbose --features "battery"
|
||||
|
||||
- name: Move autocomplete to working directory
|
||||
shell: bash
|
||||
run: |
|
||||
cargo install cargo-deb --version 1.29.0 --locked
|
||||
cargo deb
|
||||
mkdir completion
|
||||
cp -r ./target/release/build/bottom-*/out/. completion
|
||||
|
||||
- name: Build Debian release
|
||||
run: |
|
||||
cargo install cargo-deb --version 1.34.0 --locked
|
||||
cargo deb --no-build
|
||||
cp ./target/debian/bottom_*.deb ./bottom_${{ env.RELEASE_VERSION }}_amd64.deb
|
||||
|
||||
- name: Create release directory for artifact, move file
|
||||
|
|
16
.github/workflows/nightly.yml
vendored
16
.github/workflows/nightly.yml
vendored
|
@ -313,10 +313,22 @@ jobs:
|
|||
with:
|
||||
key: x86_64-unknown-linux-gnu-deb
|
||||
|
||||
- name: Build
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: build
|
||||
args: --release --verbose --features "battery"
|
||||
|
||||
- name: Move autocomplete to working directory
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir completion
|
||||
cp -r ./target/release/build/bottom-*/out/. completion
|
||||
|
||||
- name: Build Debian release
|
||||
run: |
|
||||
cargo install cargo-deb --version 1.29.0 --locked
|
||||
cargo deb
|
||||
cargo install cargo-deb --version 1.34.0 --locked
|
||||
cargo deb --no-build
|
||||
cp ./target/debian/bottom_*.deb ./bottom_${{ env.RELEASE_VERSION }}_amd64.deb
|
||||
|
||||
- name: Create release directory for artifact, move file
|
||||
|
|
10
Cargo.toml
10
Cargo.toml
|
@ -92,20 +92,16 @@ assets = [
|
|||
["target/release/btm", "usr/bin/", "755"],
|
||||
["LICENSE", "usr/share/doc/btm/", "644"],
|
||||
[
|
||||
"target/release/build/bottom-*/out/btm.bash",
|
||||
"completion/btm.bash",
|
||||
"usr/share/bash-completion/completions/btm",
|
||||
"644",
|
||||
],
|
||||
[
|
||||
"target/release/build/bottom-*/out/btm.fish",
|
||||
"completion/btm.fish",
|
||||
"usr/share/fish/vendor_completions.d/btm.fish",
|
||||
"644",
|
||||
],
|
||||
[
|
||||
"target/release/build/bottom-*/out/_btm",
|
||||
"usr/share/zsh/vendor-completions/",
|
||||
"644",
|
||||
],
|
||||
["completion/_btm", "usr/share/zsh/vendor-completions/", "644"],
|
||||
]
|
||||
extended-description = """\
|
||||
A cross-platform graphical process/system monitor with a customizable interface and a multitude of
|
||||
|
|
Loading…
Reference in a new issue