From 089f956ca5eed24a472b0f23a4ee99e0d148cab9 Mon Sep 17 00:00:00 2001
From: Maxim Logaev <maxlogaev@proton.me>
Date: Tue, 12 Mar 2024 15:51:00 +0300
Subject: [PATCH] Try fix CI

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>
---
 .github/workflows/build-win64.yml | 24 +++++++++---------------
 build-win64.sh                    |  1 -
 cmake/ComputeVersion.cmake        |  1 -
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index d79c205b..3ca47c88 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -4,29 +4,23 @@ on: [pull_request, push]
 jobs:
   build:
     runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
+          install: git
+      - run: git config --global core.autocrlf input
+      - uses: actions/checkout@v4
       - name: Build Dino
         run: |
-          ./build-win64.sh --prepare
-          ./build-win64.sh
+          msys2 -c './build-win64.sh --prepare'
+          msys2 -c './build-win64.sh'
       - name: Build Dino Installer
         run: |
-          ./build-win64.sh --build-installer
-      - name: Get Dino Installer
-        uses: actions/upload-artifact@v3
+          msys2 -c './build-win64.sh --build-installer'
+      - name: Upload Dino Installer
+        uses: actions/upload-artifact@v4
         with:
-          name: windows-installer
+          name: dino-installer
           path: windows-installer/dino-installer.exe
-      - name: Get Dino distribution
-        uses: actions/upload-artifact@v3
-        with:
-          name: win64-dist
-          path: windows-installer/win64-dist
diff --git a/build-win64.sh b/build-win64.sh
index 1d3112c6..4143a154 100644
--- a/build-win64.sh
+++ b/build-win64.sh
@@ -56,7 +56,6 @@ prepare()
        mingw64/mingw-w64-x86_64-gst-plugins-ugly \
        mingw64/mingw-w64-x86_64-nsis \
        mingw64/mingw-w64-x86_64-libsignal-protocol-c \
-       mingw64/mingw-w64-x86_64-ninja \
        mingw64/mingw-w64-x86_64-icu \
        mingw64/mingw-w64-x86_64-webrtc-audio-processing \
        git \
diff --git a/cmake/ComputeVersion.cmake b/cmake/ComputeVersion.cmake
index 704e245f..9ea38aaa 100644
--- a/cmake/ComputeVersion.cmake
+++ b/cmake/ComputeVersion.cmake
@@ -29,7 +29,6 @@ function(_compute_version_from_git)
     if (NOT GIT_EXECUTABLE)
         find_package(Git QUIET)
         if (NOT GIT_FOUND)
-            message(FATAL_ERROR "Git not found!")
             return()
         endif ()
     endif (NOT GIT_EXECUTABLE)