mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2025-06-29 04:39:53 +00:00
msys2 setup in different place (#3389)
This commit is contained in:
parent
42e0400014
commit
c9a1de6e4b
1 changed files with 17 additions and 15 deletions
32
.github/workflows/build.yml
vendored
32
.github/workflows/build.yml
vendored
|
@ -261,11 +261,27 @@ jobs:
|
||||||
# / Windows
|
# / Windows
|
||||||
# rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
|
# rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
|
||||||
|
|
||||||
|
- name: 'Setup MSYS2'
|
||||||
|
if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
|
||||||
|
uses: msys2/setup-msys2@v2
|
||||||
|
with:
|
||||||
|
msystem: ucrt64
|
||||||
|
update: true
|
||||||
|
install: >-
|
||||||
|
git
|
||||||
|
perl
|
||||||
|
make
|
||||||
|
pacboy: >-
|
||||||
|
toolchain:p
|
||||||
|
cmake:p
|
||||||
|
|
||||||
|
|
||||||
- name: Windows build
|
- name: Windows build
|
||||||
id: windows_build
|
id: windows_build
|
||||||
if: matrix.os == 'windows-latest'
|
if: matrix.os == 'windows-latest'
|
||||||
shell: bash
|
shell: msys2 {0}
|
||||||
run: |
|
run: |
|
||||||
|
export PATH=$PATH:/c/ghcup/bin
|
||||||
scripts/desktop/prepare-openssl-windows.sh
|
scripts/desktop/prepare-openssl-windows.sh
|
||||||
openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
|
openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
|
||||||
rm cabal.project.local 2>/dev/null || true
|
rm cabal.project.local 2>/dev/null || true
|
||||||
|
@ -302,20 +318,6 @@ jobs:
|
||||||
body: |
|
body: |
|
||||||
${{ steps.windows_build.outputs.bin_hash }}
|
${{ steps.windows_build.outputs.bin_hash }}
|
||||||
|
|
||||||
- name: 'Setup MSYS2'
|
|
||||||
if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
|
|
||||||
uses: msys2/setup-msys2@v2
|
|
||||||
with:
|
|
||||||
msystem: ucrt64
|
|
||||||
update: true
|
|
||||||
install: >-
|
|
||||||
git
|
|
||||||
perl
|
|
||||||
make
|
|
||||||
pacboy: >-
|
|
||||||
toolchain:p
|
|
||||||
cmake:p
|
|
||||||
|
|
||||||
- name: Windows build desktop
|
- name: Windows build desktop
|
||||||
id: windows_desktop_build
|
id: windows_desktop_build
|
||||||
if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
|
if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue