diff --git a/.github/workflows/build_deb.yml b/.github/workflows/build_deb.yml index 7663d7e..903b013 100644 --- a/.github/workflows/build_deb.yml +++ b/.github/workflows/build_deb.yml @@ -15,7 +15,7 @@ jobs: override: true - run: cargo install cargo-deb - run: cargo build --release - - run: ./build-manpages.sh + - run: ./prepare-release.sh - run: cargo deb - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fea4f16..8146dd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,13 +40,10 @@ jobs: toolchain: stable override: true - uses: Swatinem/rust-cache@v2 - - run: cargo install mdsh mandown - run: cargo build --release - - run: ./build-manpages.sh + - run: ./prepare-release.sh - uses: actions/upload-artifact@v3 with: name: git-mob-${{ matrix.os }} path: | - target/release/git-* - target/man - !target/release/*.d + ci-release/git-mob diff --git a/build-manpages.sh b/build-manpages.sh deleted file mode 100755 index 45e59f6..0000000 --- a/build-manpages.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -mkdir -p target/man -for page in git-{mob,solo,{add,edit,delete}-coauthor}.1; do - gzip --to-stdout target/release/$page > target/man/$page.gz -done diff --git a/prepare-release.sh b/prepare-release.sh new file mode 100755 index 0000000..3fa7b6e --- /dev/null +++ b/prepare-release.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -e + +OUT_DIR=ci-release/git-mob +mkdir -p $OUT_DIR/{bin,man} + +for binary in git-{mob,solo,{add,edit,delete}-coauthor}; do + gzip --to-stdout target/release/$binary.1 > $OUT_DIR/man/$binary.gz + cp target/release/$binary $OUT_DIR/bin/$binary +done