Skip to content
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ jobs:
cargo build

- name: Run tests
run: make test
run: just test

- name: Run clippy
run: |
make clippy
just clippy

- name: Build Release
run: make build-release
run: just build-release

- name: Test Install
run: cargo install --path "." --force --locked
Expand Down Expand Up @@ -126,16 +126,16 @@ jobs:
sudo apt-get -qq install musl-tools
- name: Build Debug
run: |
make build-linux-musl-debug
just build-linux-musl-debug
./target/x86_64-unknown-linux-musl/debug/gitui --version
- name: Build Release
run: |
make build-linux-musl-release
just build-linux-musl-release
./target/x86_64-unknown-linux-musl/release/gitui --version
ls -l ./target/x86_64-unknown-linux-musl/release/gitui
- name: Test
run: |
make test-linux-musl
just test-linux-musl
- name: Test Install
run: cargo install --path "." --force --locked

Expand Down Expand Up @@ -184,10 +184,10 @@ jobs:

- name: Build Debug
run: |
make build-linux-arm-debug
just build-linux-arm-debug
- name: Build Release
run: |
make build-linux-arm-release
just build-linux-arm-release
ls -l ./target/aarch64-unknown-linux-gnu/release/gitui || ls -l ./target/armv7-unknown-linux-gnueabihf/release/gitui || ls -l ./target/arm-unknown-linux-gnueabihf/release/gitui

build-apple-x86:
Expand Down Expand Up @@ -223,10 +223,10 @@ jobs:

- name: Build Debug
run: |
make build-apple-x86-debug
just build-apple-x86-debug
- name: Build Release
run: |
make build-apple-x86-release
just build-apple-x86-release
ls -l ./target/x86_64-apple-darwin/release/gitui

linting:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
![blame-goto-line](assets/blame-goto-line.png)

### Added
* replace the old makefile with a justfile [[@PokumeKachi](https://github.com/PokumeKachi)]
* support choosing checkout branch method when status is not empty [[@fatpandac](https://github.com/fatpandac)] ([#2404](https://github.com/extrawurst/gitui/issues/2404))
* support pre-push hook [[@xlai89](https://github.com/xlai89)] ([#1933](https://github.com/extrawurst/gitui/issues/1933))
* message tab supports pageUp and pageDown [[@xlai89](https://github.com/xlai89)] ([#2623](https://github.com/extrawurst/gitui/issues/2623))
Expand Down
20 changes: 9 additions & 11 deletions Makefile → Justfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
ARGS := "-l"
#ARGS := "-l -d ~/code/extern/kubernetes"
#ARGS := "-l -d ~/code/extern/linux"
#ARGS := "-l -d ~/code/git-bare-test.git -w ~/code/git-bare-test"

.PHONY: debug build-release release-linux-musl test clippy clippy-pedantic install install-debug sort

ARGS=-l
# ARGS=-l -d ~/code/extern/kubernetes
# ARGS=-l -d ~/code/extern/linux
# ARGS=-l -d ~/code/git-bare-test.git -w ~/code/git-bare-test
_default:
@just --choose || true

profile:
CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --features timing -- ${ARGS}
CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --features timing -- {{ARGS}}

run-timing:
cargo run --features=timing --release -- ${ARGS}
cargo run --features=timing --release -- {{ARGS}}

debug:
RUST_BACKTRACE=true cargo run --features=timing -- ${ARGS}
RUST_BACKTRACE=true cargo run --features=timing -- {{ARGS}}

build-release:
cargo build --release --locked
Expand Down Expand Up @@ -63,11 +63,9 @@ test-linux-musl:

release-linux-arm: build-linux-arm-release
mkdir -p release

aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/gitui
arm-linux-gnueabihf-strip target/armv7-unknown-linux-gnueabihf/release/gitui
arm-linux-gnueabihf-strip target/arm-unknown-linux-gnueabihf/release/gitui

tar -C ./target/aarch64-unknown-linux-gnu/release/ -czvf ./release/gitui-linux-aarch64.tar.gz ./gitui
tar -C ./target/armv7-unknown-linux-gnueabihf/release/ -czvf ./release/gitui-linux-armv7.tar.gz ./gitui
tar -C ./target/arm-unknown-linux-gnueabihf/release/ -czvf ./release/gitui-linux-arm.tar.gz ./gitui
Expand Down