diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d39854f847..e653fb26fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,8 +78,8 @@ jobs: run: | cargo install cargo-wix --version 0.3.3 cargo wix --version - cargo wix -p gitui --no-build --nocapture --output ./target/wix/gitui.msi - ls -l ./target/wix/gitui.msi + cargo wix -p gitui --no-build --nocapture --output ./target/wix/gitui-win.msi + ls -l ./target/wix/gitui-win.msi build-linux-musl: runs-on: ubuntu-latest @@ -103,7 +103,7 @@ jobs: with: toolchain: ${{ matrix.rust }} targets: x86_64-unknown-linux-musl - + # The build would fail without manually installing the target. # https://github.com/dtolnay/rust-toolchain/issues/83 - name: Manually install target @@ -219,10 +219,10 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@nightly - + - name: build cargo-udeps run: cargo install --git https://github.com/est31/cargo-udeps --locked - + - name: run cargo-udeps run: cargo +nightly udeps --all-targets diff --git a/Makefile b/Makefile index 32498b5253..93aee1eca7 100644 --- a/Makefile +++ b/Makefile @@ -30,13 +30,13 @@ release-win: build-release mkdir -p release tar -C ./target/release/ -czvf ./release/gitui-win.tar.gz ./gitui.exe cargo install cargo-wix --version 0.3.3 - cargo wix -p gitui --no-build --nocapture --output ./release/gitui.msi - ls -l ./release/gitui.msi + cargo wix -p gitui --no-build --nocapture --output ./release/gitui-win.msi + ls -l ./release/gitui-win.msi release-linux-musl: build-linux-musl-release strip target/x86_64-unknown-linux-musl/release/gitui mkdir -p release - tar -C ./target/x86_64-unknown-linux-musl/release/ -czvf ./release/gitui-linux-musl.tar.gz ./gitui + tar -C ./target/x86_64-unknown-linux-musl/release/ -czvf ./release/gitui-linux-x86_64.tar.gz ./gitui build-linux-musl-debug: cargo build --target=x86_64-unknown-linux-musl diff --git a/README.md b/README.md index 78750bf586..b6b3e15ebd 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ Binaries available for: ### Linux -- gitui-linux-musl.tar.gz (linux on x86_64) +- gitui-linux-x86_64.tar.gz (linux musl statically linked) - gitui-linux-aarch64.tar.gz (linux on 64 bit arm) - gitui-linux-arm.tar.gz - gitui-linux-armv7.tar.gz @@ -211,7 +211,7 @@ All contain a single binary file ### Windows - gitui-win.tar.gz (single 64bit binary) -- gitui.msi (64bit Installer package) +- gitui-win.msi (64bit Installer package) ## 7. Build [Top ▲](#table-of-contents)