Try fix CI

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>
This commit is contained in:
Maxim Logaev 2024-03-12 15:51:00 +03:00
parent 22984621fb
commit 089f956ca5
3 changed files with 9 additions and 17 deletions

View file

@ -4,29 +4,23 @@ on: [pull_request, push]
jobs: jobs:
build: build:
runs-on: windows-latest runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
steps: steps:
- uses: actions/checkout@v3
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
with: with:
msystem: MINGW64 msystem: MINGW64
update: true update: true
install: git
- run: git config --global core.autocrlf input
- uses: actions/checkout@v4
- name: Build Dino - name: Build Dino
run: | run: |
./build-win64.sh --prepare msys2 -c './build-win64.sh --prepare'
./build-win64.sh msys2 -c './build-win64.sh'
- name: Build Dino Installer - name: Build Dino Installer
run: | run: |
./build-win64.sh --build-installer msys2 -c './build-win64.sh --build-installer'
- name: Get Dino Installer - name: Upload Dino Installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: windows-installer name: dino-installer
path: windows-installer/dino-installer.exe path: windows-installer/dino-installer.exe
- name: Get Dino distribution
uses: actions/upload-artifact@v3
with:
name: win64-dist
path: windows-installer/win64-dist

View file

@ -56,7 +56,6 @@ prepare()
mingw64/mingw-w64-x86_64-gst-plugins-ugly \ mingw64/mingw-w64-x86_64-gst-plugins-ugly \
mingw64/mingw-w64-x86_64-nsis \ mingw64/mingw-w64-x86_64-nsis \
mingw64/mingw-w64-x86_64-libsignal-protocol-c \ 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-icu \
mingw64/mingw-w64-x86_64-webrtc-audio-processing \ mingw64/mingw-w64-x86_64-webrtc-audio-processing \
git \ git \

View file

@ -29,7 +29,6 @@ function(_compute_version_from_git)
if (NOT GIT_EXECUTABLE) if (NOT GIT_EXECUTABLE)
find_package(Git QUIET) find_package(Git QUIET)
if (NOT GIT_FOUND) if (NOT GIT_FOUND)
message(FATAL_ERROR "Git not found!")
return() return()
endif () endif ()
endif (NOT GIT_EXECUTABLE) endif (NOT GIT_EXECUTABLE)