Merge remote-tracking branch 'origin/feat-sort-branch' into feat-sort-branch

Author: UUGTech

.github/workflows/cd.yml

@@ -68,16 +68,16 @@ jobs:
 
     - name: Build Release Mac
       if: matrix.os == 'macos-latest'
-      run: make release-mac
+      run: GITUI_RELEASE=1 make release-mac
     - name: Build Release Linux
       if: matrix.os == 'ubuntu-latest'
-      run: make release-linux-musl
+      run: GITUI_RELEASE=1 make release-linux-musl
     - name: Build Release Win
       if: matrix.os == 'windows-latest'
-      run: make release-win
+      run: GITUI_RELEASE=1 make release-win
     - name: Build Release Linux ARM
       if: matrix.os == 'ubuntu-22.04'
-      run: make release-linux-arm
+      run: GITUI_RELEASE=1 make release-linux-arm
 
     - name: Set SHA
       if: matrix.os == 'macos-latest'

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   schedule:
-    - cron: '0 2 * * *' # run at 2 AM UTC
+    - cron: '0 2 * * *'
   push:
     branches: [ '*' ]
   pull_request:
@@ -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
 

.github/workflows/nightly.yml

@@ -0,0 +1,119 @@
+name: Build Nightly Releases
+
+on: 
+  schedule:
+    - cron: '0 3 * * *'
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+  AWS_BUCKET_NAME: s3://gitui/nightly/
+
+jobs:
+  release:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [
+          ubuntu-latest, macos-latest, windows-latest, ubuntu-22.04
+          ]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Restore cargo cache
+      uses: Swatinem/rust-cache@v2
+      env:
+        cache-name: ci
+      with:
+        shared-key: ${{ matrix.os }}-${{ env.cache-name }}-stable
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        components: clippy
+
+    # ideally we trigger the nightly build/deploy only if the normal nightly CI finished successfully 
+    - name: Run tests
+      if: matrix.os != 'ubuntu-22.04'
+      run: make test
+    - name: Run clippy
+      if: matrix.os != 'ubuntu-22.04'
+      run: |
+        cargo clean
+        make clippy
+
+    - name: Setup MUSL
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        rustup target add x86_64-unknown-linux-musl
+        sudo apt-get -qq install musl-tools
+
+    - name: Setup ARM toolchain
+      if: matrix.os == 'ubuntu-22.04'
+      run: |
+        rustup target add aarch64-unknown-linux-gnu
+        rustup target add armv7-unknown-linux-gnueabihf
+        rustup target add arm-unknown-linux-gnueabihf
+
+        curl -o $GITHUB_WORKSPACE/aarch64.tar.xz https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu.tar.xz
+        curl -o $GITHUB_WORKSPACE/arm.tar.xz https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf.tar.xz
+
+        tar xf $GITHUB_WORKSPACE/aarch64.tar.xz
+        tar xf $GITHUB_WORKSPACE/arm.tar.xz
+
+        echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu/bin" >> $GITHUB_PATH
+        echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf/bin" >> $GITHUB_PATH
+
+    - name: Build Release Mac
+      if: matrix.os == 'macos-latest'
+      run: make release-mac
+    - name: Build Release Linux
+      if: matrix.os == 'ubuntu-latest'
+      run: make release-linux-musl
+    - name: Build Release Win
+      if: matrix.os == 'windows-latest'
+      run: make release-win
+    - name: Build Release Linux ARM
+      if: matrix.os == 'ubuntu-22.04'
+      run: make release-linux-arm
+
+    - name: Ubuntu 22.04 Upload Artifact
+      if: matrix.os == 'ubuntu-22.04'
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+      run: |
+        aws s3 cp ./release/gitui-linux-armv7.tar.gz $AWS_BUCKET_NAME
+        aws s3 cp ./release/gitui-linux-arm.tar.gz $AWS_BUCKET_NAME
+        aws s3 cp ./release/gitui-linux-aarch64.tar.gz $AWS_BUCKET_NAME
+          
+    - name: Ubuntu Latest Upload Artifact
+      if: matrix.os == 'ubuntu-latest'
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+      run: |
+        aws s3 cp ./release/gitui-linux-x86_64.tar.gz $AWS_BUCKET_NAME
+
+    - name: MacOS Upload Artifact
+      if: matrix.os == 'macos-latest'  
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+      run: |
+        aws s3 cp ./release/gitui-mac.tar.gz $AWS_BUCKET_NAME
+
+    - name: Windows Upload Artifact
+      if: matrix.os == 'windows-latest' 
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+      run: |
+        aws s3 cp ./release/gitui-win.msi $env:AWS_BUCKET_NAME
+        aws s3 cp ./release/gitui-win.tar.gz $env:AWS_BUCKET_NAME

CHANGELOG.md

@@ -8,11 +8,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
+* provide nightly builds (see [NIGHTLIES.md](./NIGHTLIES.md)) ([#2083](https://github.com/extrawurst/gitui/issues/2083))
 * sign commits using openpgp [[@hendrikmaus](https://github.com/hendrikmaus)] ([#97](https://github.com/extrawurst/gitui/issues/97))
+* support `core.commitChar` filtering [[@concelare](https://github.com/concelare)] ([#2136](https://github.com/extrawurst/gitui/issues/2136))
+* more version info in `gitui -V` and `help popup` (including git hash)
 * add sort_by popup to branchlist [[@UUGTech](https://github.com/UUGTech)]([#2146](https://github.com/extrawurst/gitui/issues/2146))
 
 ### Changed
 * Make info and error message popups scrollable [[@MichaelAug](https://github.com/MichaelAug)] ([#1138](https://github.com/extrawurst/gitui/issues/1138))
+* clarify `x86_64` linux binary in artifact names: `gitui-linux-x86_64.tar.gz` (formerly known as `musl`) ([#2148](https://github.com/extrawurst/gitui/issues/2148))
+
+### Fixes
+* add syntax highlighting support for more file types, e.g. Typescript, TOML, etc. [[@martihomssoler](https://github.com/martihomssoler)] ([#2005](https://github.com/extrawurst/gitui/issues/2005))
 
 ## [0.25.2] - 2024-03-22
 

Cargo.lock

@@ -12,6 +12,7 @@ readme = "README.md"
 license = "MIT"
 categories = ["command-line-utilities"]
 keywords = ["git", "gui", "cli", "terminal", "ui"]
+build = "build.rs"
 
 [dependencies]
 anyhow = "1.0"
@@ -57,6 +58,7 @@ syntect = { version = "5.2", default-features = false, features = [
     "html",
 ] }
 tui-textarea = "0.4.0"
+two-face = { version = "0.3.0", default-features = false }
 unicode-segmentation = "1.11"
 unicode-truncate = "0.2"
 unicode-width = "0.1"
@@ -66,15 +68,18 @@ which = "6.0"
 pretty_assertions = "1.4"
 tempfile = "3"
 
+[build-dependencies]
+chrono = { version = "0.4", default-features = false, features = ["clock"] }
+
 [badges]
 maintenance = { status = "actively-developed" }
 
 [features]
 default = ["ghemoji", "regex-fancy", "trace-libgit", "vendor-openssl"]
 ghemoji = ["gh-emoji"]
 # regex-* features are mutually exclusive.
-regex-fancy = ["syntect/regex-fancy"]
-regex-onig = ["syntect/regex-onig"]
+regex-fancy = ["syntect/regex-fancy", "two-face/syntect-fancy"]
+regex-onig = ["syntect/regex-onig", "two-face/syntect-onig"]
 timing = ["scopetime/enabled"]
 trace-libgit = ["asyncgit/trace-libgit"]
 vendor-openssl = ["asyncgit/vendor-openssl"]

Cargo.toml

@@ -7,7 +7,7 @@ ARGS=-l
 # ARGS=-l -d ~/code/git-bare-test.git -w ~/code/git-bare-test
 
 profile:
-	sudo 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}
@@ -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
@@ -100,4 +100,4 @@ licenses:
 	cargo bundle-licenses --format toml --output THIRDPARTY.toml
 
 clean:
-	cargo clean
+	cargo clean