[pull] master from extrawurst:master

.clippy.toml

@@ -1,2 +1,2 @@
-msrv = "1.65.0"
-cognitive-complexity-threshold = 18
+msrv = "1.81.0"
+cognitive-complexity-threshold = 18

.editorconfig

@@ -0,0 +1,3 @@
+root = true
+[*.rs]
+indent_style = tab

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!---
 Thank you for contributing to GitUI! Please fill out the template below, and remove or add any
-information as you feel neccesary.
+information as you feel necessary.
 --->
 
 This Pull Request fixes/closes #{issue_num}.

.github/workflows/brew.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Bump homebrew-core formula
-      uses: mislav/bump-homebrew-formula-action@v2
+      uses: mislav/bump-homebrew-formula-action@v3
       env:
         COMMITTER_TOKEN: ${{ secrets.BREW_TOKEN }}
       with:

.github/workflows/cd.yml

@@ -4,6 +4,7 @@ on:
   push:
    tags:
      - '*'
+  workflow_dispatch:
 
 jobs:
   release:
@@ -14,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Get version
       id: get_version
@@ -34,6 +35,8 @@ jobs:
 
     - name: Build
       if: matrix.os != 'ubuntu-22.04'
+      env:
+        GITUI_RELEASE: 1
       run: cargo build
     - name: Run tests
       if: matrix.os != 'ubuntu-22.04'
@@ -68,15 +71,30 @@ jobs:
 
     - name: Build Release Mac
       if: matrix.os == 'macos-latest'
+      env:
+        GITUI_RELEASE: 1
       run: make release-mac
+    - name: Build Release Mac x86
+      if: matrix.os == 'macos-latest'
+      env:
+        GITUI_RELEASE: 1
+      run: |
+        rustup target add x86_64-apple-darwin
+        make release-mac-x86
     - name: Build Release Linux
       if: matrix.os == 'ubuntu-latest'
+      env:
+        GITUI_RELEASE: 1
       run: make release-linux-musl
     - name: Build Release Win
       if: matrix.os == 'windows-latest'
+      env:
+        GITUI_RELEASE: 1
       run: make release-win
     - name: Build Release Linux ARM
       if: matrix.os == 'ubuntu-22.04'
+      env:
+        GITUI_RELEASE: 1
       run: make release-linux-arm
 
     - name: Set SHA
@@ -88,9 +106,9 @@ jobs:
     - name: Extract release notes
       if: matrix.os == 'ubuntu-latest'
       id: release_notes
-      uses: ffurrer2/extract-release-notes@v1
+      uses: ffurrer2/extract-release-notes@v2
     - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -102,7 +120,7 @@ jobs:
           ./release/*.msi
 
     - name: Bump homebrew-core formula
-      uses: mislav/bump-homebrew-formula-action@v2
+      uses: mislav/bump-homebrew-formula-action@v3
       if: "matrix.os == 'macos-latest' && !contains(github.ref, '-')" # skip prereleases
       env:
         COMMITTER_TOKEN: ${{ secrets.BREW_TOKEN }}

.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:
@@ -17,12 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [nightly, stable, '1.65']
+        rust: [nightly, stable, '1.81']
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.rust == 'nightly' }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Restore cargo cache
       uses: Swatinem/rust-cache@v2
@@ -41,6 +41,12 @@ jobs:
         toolchain: ${{ matrix.rust }}
         components: clippy
 
+    - name: Override rust toolchain
+      run: rustup override set ${{ matrix.rust }}
+
+    - name: Rustup Show
+      run: rustup show
+
     - name: Build Debug
       run: |
         cargo build
@@ -78,18 +84,18 @@ 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
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, stable, '1.65']
+        rust: [nightly, stable, '1.81']
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Restore cargo cache
       uses: Swatinem/rust-cache@v2
@@ -103,12 +109,18 @@ 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
       run: rustup target add x86_64-unknown-linux-musl
 
+    - name: Override rust toolchain
+      run: rustup override set ${{ matrix.rust }}
+
+    - name: Rustup Show
+      run: rustup show
+
     - name: Setup MUSL
       run: |
         sudo apt-get -qq install musl-tools
@@ -132,10 +144,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, stable, '1.65']
+        rust: [nightly, stable, '1.81']
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Restore cargo cache
       uses: Swatinem/rust-cache@v2
@@ -148,6 +160,10 @@ jobs:
       uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.rust }}
+
+    - name: Override rust toolchain
+      run: rustup override set ${{ matrix.rust }}
+
     - name: Setup ARM toolchain
       run: |
         rustup target add aarch64-unknown-linux-gnu
@@ -163,6 +179,9 @@ jobs:
         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: Rustup Show
+      run: rustup show
+
     - name: Build Debug
       run: |
         make build-linux-arm-debug
@@ -171,11 +190,50 @@ jobs:
         make 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:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust: [nightly, stable, '1.81']
+    continue-on-error: ${{ matrix.rust == 'nightly' }}
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Restore cargo cache
+      uses: Swatinem/rust-cache@v2
+      env:
+        cache-name: ci
+      with:
+        key: apple-x86-${{ env.cache-name }}-${{ matrix.rust }}
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.rust }}
+
+    - name: Override rust toolchain
+      run: rustup override set ${{ matrix.rust }}
+
+    - name: Setup target
+      run: rustup target add x86_64-apple-darwin
+
+    - name: Rustup Show
+      run: rustup show
+
+    - name: Build Debug
+      run: |
+        make build-apple-x86-debug
+    - name: Build Release
+      run: |
+        make build-apple-x86-release
+        ls -l ./target/x86_64-apple-darwin/release/gitui
+
   linting:
     name: Lints
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Restore cargo cache
       uses: Swatinem/rust-cache@v2
@@ -200,19 +258,15 @@ jobs:
       run: |
         cargo install --locked cargo-deny
 
-    - name: cargo-deny licenses
+    - name: cargo-deny checks
       run: |
-        cargo deny check licenses
-
-    - name: cargo-deny bans
-      run: |
-        cargo deny check bans
+        cargo deny check
 
   udeps:
     name: udeps
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Restore cargo cache
       uses: Swatinem/rust-cache@v2
@@ -223,33 +277,52 @@ jobs:
 
     - name: Install Rust
       uses: dtolnay/rust-toolchain@nightly
-
-    - name: cargo-udeps
-      run: |
-        # cargo install --locked cargo-udeps
-        cargo install --git https://github.com/est31/cargo-udeps --locked
-        cargo +nightly udeps --all-targets
 
-  sec:
-    name: Security audit
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: rustsec/audit-check@v1
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
+    - 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
 
   log-test:
     name: Changelog Test
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Extract release notes
       id: extract_release_notes
-      uses: ffurrer2/extract-release-notes@v1
+      uses: ffurrer2/extract-release-notes@v2
       with:
         release_notes_file: ./release-notes.txt
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: release-notes.txt
         path: ./release-notes.txt
+
+  test-homebrew:
+    name: Test Homebrew Formula (macOS)
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install stable Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Install Homebrew
+        run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+      - name: Set up Homebrew in PATH
+        run: |
+          echo "$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" >> $GITHUB_PATH
+
+      - name: Update Homebrew
+        run: brew update
+
+      - name: Let Homebrew build gitui from source
+        run: brew install --head --build-from-source gitui
+
+      - name: Run Homebrew test
+        run: brew test gitui