Download as
Browse Code »

Commit 324cfae7dff2d0b8f1330f6c62323bf7cf8ddd95

Authored by Perry Werneck
1 parent 39c26b15
Exists in master and in 1 other branch develop

Fixing merge.

Showing 1 changed file with 0 additions and 13 deletions   Show diff stats
.github/workflows/msys2.yml
  Diff comments   View file @324cfae
... ... @@ -5,11 +5,7 @@ on:
5 5 - master
6 6  
7 7 jobs:
8   -<<<<<<< HEAD
9   - msys2-ucrt64:
10   -=======
11 8 msys2-mingw:
12   ->>>>>>> master
13 9 runs-on: windows-latest
14 10 defaults:
15 11 run:
... ... @@ -18,19 +14,10 @@ jobs:
18 14 - uses: actions/checkout@v3
19 15 - uses: msys2/setup-msys2@v2
20 16 with:
21   -<<<<<<< HEAD
22   - msystem: UCRT64
23   - update: true
24   - install: git mingw-w64-ucrt-x86_64-gcc automake autoconf make git pkgconf gettext-devel libtool xz mingw-w64-x86_64-openssl mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape mingw-w64-x86_64-gettext
25   - - name: CI-Build
26   - run: |
27   - echo 'Running in MSYS2!'
28   -=======
29 17 msystem: mingw64
30 18 update: true
31 19 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape
32 20 - name: CI-Build
33 21 run: |
34   ->>>>>>> master
35 22 ./win/ci-build.sh
36 23  
... ...