Merge branch 'master' into patch-gittyup-qt6

Murmele · Jan 23, 2025 · bcacf70 · bcacf70
2 parents c33a6c2 + 1612c7a
commit bcacf70
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -120,7 +120,7 @@ jobs:
         branch: ${{ steps.flatpak_release_branch.outputs.value }}
 
     - name: Publish build artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         path: Gittyup.flatpak
         name: GittyupFlatpak
@@ -147,7 +147,7 @@ jobs:
             cmake_env: {}
 
           - name: macos
-            os: macos-12
+            os: macos-13
             ninja_platform: mac
             qt_platform: mac
             openssl_arch: darwin64-x86_64-cc
@@ -277,14 +277,15 @@ jobs:
 
       - name: Publish build artifacts
         if: matrix.env.pack
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: build/release/pack/Gittyup-*
           name: Gittyup ${{ matrix.env.name }}
 
+      # Publish only once!
       - name: Publish version file
         if: matrix.env.pack
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: build/release/Version.txt
           name: Gittyup-VERSION
@@ -346,7 +347,7 @@ jobs:
 
       - name: Publish Appimage
         if: matrix.env.ninja_platform == 'linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: build/release/*.AppImage
           name: GittyupAppImage
@@ -363,7 +364,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/master' || (github.event_name == 'push' && github.ref_type == 'tag' && startswith(github.ref_name, 'gittyup_v'))  }}
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 

diff --git a/com.github.Murmele.Gittyup.yml b/com.github.Murmele.Gittyup.yml
@@ -34,8 +34,8 @@ modules:
     sources:
       - type: archive
         strip-components: 1
-        url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-amd64-v3.5.1.tar.gz
-        sha256: 6f28eb19faa7a968882dca190d92adc82493378b933958d67ceaeb9ebe4d731e
+        url: https://github.com/git-lfs/git-lfs/releases/download/v3.6.0/git-lfs-linux-amd64-v3.6.0.tar.gz
+        sha256: fff4746159aa7a7b42ef1aa30fed03b534df48a7dbe116d65296c0f0c43c594d
         only-arches: [x86_64]
         x-checker-data:
           type: json
@@ -45,8 +45,8 @@ modules:
           version-query: .tag_name
       - type: archive
         strip-components: 1
-        url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-arm64-v3.5.1.tar.gz
-        sha256: 4f8700aacaa0fd26ae5300fb0996aed14d1fd0ce1a63eb690629c132ff5163a9
+        url: https://github.com/git-lfs/git-lfs/releases/download/v3.6.0/git-lfs-linux-arm64-v3.6.0.tar.gz
+        sha256: 9509504b3b825054c3d07af5edc1cc9c00732c6f0fd4a060f04bfbf0f1279fca
         only-arches: [aarch64]
         x-checker-data:
           type: json

diff --git a/docs/index.md b/docs/index.md
@@ -4,8 +4,8 @@ Gittyup is a graphical Git client designed to help you understand and manage you
 
 Stable versions for different packages are available for
 - Flatpak for Linux [![Flathub](https://img.shields.io/badge/Flathub-gray?logo=Flathub&logoColor=23FBB04)](https://flathub.org/apps/details/com.github.Murmele.Gittyup)
-- [32 / 64 binary for Windows](https://github.com/Murmele/Gittyup/releases/stable) or
-- [macOS](https://github.com/Murmele/Gittyup/releases/stable) or from [![homebrew](https://img.shields.io/badge/Homebrew-gray?logo=Homebrew&logoColor=%23FBB040)](https://formulae.brew.sh/cask/gittyup)
+- [32 / 64 binary for Windows](https://github.com/Murmele/Gittyup/releases/latest) or
+- [macOS](https://github.com/Murmele/Gittyup/releases/latest) or from [![homebrew](https://img.shields.io/badge/Homebrew-gray?logo=Homebrew&logoColor=%23FBB040)](https://formulae.brew.sh/cask/gittyup)
 
 The [latest development version](https://github.com/Murmele/Gittyup/releases/tag/development) is available either as pre-built for
 - flatpak for Linux,