diff options
author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2022-03-11 06:45:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-11 06:45:05 -0500 |
commit | f2b8b4e8427996407b484c4a4ed9432519c9d3a5 (patch) | |
tree | 02dc3866ce71afeab52fe268459d9af5531779e3 /.github | |
parent | 8087f0b636b94ff5763a3a5637dea9a343784bd7 (diff) |
other: add manpage file to cargo deb config, move back to build script (#693)
Adds the asset for the manpage to cargo deb config. Also moves the generated manpage file to a .1.gz file. Also, moves back to a build script since that was causing some issues for the automatic Cargo.toml fields detection for manpage and completion generation.
To prevent compilation from happening every time, and only in CI, we use an env var to avoid generation steps.
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/deployment.yml | 16 | ||||
-rw-r--r-- | .github/workflows/nightly.yml | 16 |
2 files changed, 12 insertions, 20 deletions
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index e5dcb4fe..2dd1c9b2 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -148,15 +148,10 @@ jobs: args: --release --verbose --target=${{ matrix.triple.target }} --features "battery" use-cross: ${{ matrix.triple.cross }} - - name: Build autocompletion + - name: Build autocompletion and manpage shell: bash run: | - cargo run --manifest-path ./xtask/Cargo.toml -- completion completion - - - name: Build manpage - shell: bash - run: | - cargo run --manifest-path ./xtask/Cargo.toml -- manpage manpage + GENERATE=true cargo build - name: Bundle release and completion (Windows) if: matrix.triple.os == 'windows-2019' @@ -192,6 +187,7 @@ jobs: if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == '' shell: bash run: | + gzip ./manpage/btm.1 tar -C ./manpage -czvf manpage.tar.gz . mv manpage.tar.gz release/ @@ -319,11 +315,11 @@ jobs: command: build args: --release --verbose --features "battery" - - name: Move autocomplete to working directory + - name: Build autocompletion and manpage shell: bash run: | - mkdir completion - cp -r ./target/release/build/bottom-*/out/. completion + GENERATE=true cargo build + gzip ./manpage/btm.1 - name: Build Debian release run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2db1942f..564c053e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -144,15 +144,10 @@ jobs: args: --release --verbose --target=${{ matrix.triple.target }} --features "battery" use-cross: ${{ matrix.triple.cross }} - - name: Build autocompletion + - name: Build autocompletion and manpage shell: bash run: | - cargo run --manifest-path ./xtask/Cargo.toml -- completion completion - - - name: Build manpage - shell: bash - run: | - cargo run --manifest-path ./xtask/Cargo.toml -- manpage manpage + GENERATE=true cargo build - name: Bundle release and completion (Windows) if: matrix.triple.os == 'windows-2019' @@ -188,6 +183,7 @@ jobs: if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == '' shell: bash run: | + gzip ./manpage/btm.1 tar -C ./manpage -czvf manpage.tar.gz . mv manpage.tar.gz release/ @@ -313,11 +309,11 @@ jobs: command: build args: --release --verbose --features "battery" - - name: Move autocomplete to working directory + - name: Build autocompletion and manpage shell: bash run: | - mkdir completion - cp -r ./target/release/build/bottom-*/out/. completion + GENERATE=true cargo build + gzip ./manpage/btm.1 - name: Build Debian release run: | |