msys2_fix

.github/workflows/vangers_windows_32_build.yml

@@ -10,7 +10,7 @@ jobs:
       with:
         msystem: MINGW32
     - name: install libs
-      run: msys2do pacman --noconfirm -S
+      run: msys2 -c 'pacman --noconfirm -S
         mingw-w64-i686-ninja
         mingw-w64-i686-gcc
         mingw-w64-i686-SDL2
@@ -20,22 +20,22 @@ jobs:
         mingw-w64-i686-libvorbis
         mingw-w64-i686-nasm
         mingw-w64-i686-yasm
-        mingw-w64-i686-make
+        mingw-w64-i686-make'
     - uses: actions/checkout@v1
     - name: clunk -- download
       run: git clone --depth 1 https://github.com/stalkerg/clunk.git clunk
     - name: clunk -- create build dir
-      run: msys2do mkdir clunk/build
+      run: msys2 -c 'mkdir clunk/build'
     - name: clunk -- build and install
       run: |
-        msys2do cmake -DCMAKE_INSTALL_PREFIX=/mingw32 -G Ninja ..
-        msys2do ninja
-        msys2do ninja install
+        msys2 -c 'cmake -DCMAKE_INSTALL_PREFIX=/mingw32 -G Ninja ..'
+        msys2 -c 'ninja'
+        msys2 -c 'ninja install'
       working-directory: clunk/build
     - name: ffmpeg -- download
       run: git clone --depth 1 --branch n4.2.2 https://git.ffmpeg.org/ffmpeg.git ffmpeg
     - name: ffmpeg -- configure
-      run: msys2do ./configure --enable-shared --prefix=/mingw32
+      run: msys2 -c './configure --enable-shared --prefix=/mingw32'
         --disable-everything
         --enable-swscale
         --enable-zlib
@@ -50,38 +50,38 @@ jobs:
       working-directory: ffmpeg
     - name: ffmpeg -- build and install
       run: |
-        msys2do mingw32-make -j4
-        msys2do mingw32-make install
+        msys2 -c 'mingw32-make -j4'
+        msys2 -c 'mingw32-make install'
       working-directory: ffmpeg
     - name: vangers -- create build dir
-      run: msys2do mkdir build
+      run: msys2 -c 'mkdir build'
     - name: vangers -- configure
-      run: msys2do cmake -G Ninja ..
+      run: msys2 -c 'cmake -G Ninja ..'
       working-directory: build
     - name: vangers -- make
-      run: msys2do ninja
+      run: msys2 -c 'ninja'
       working-directory: build
     - name: vangers -- prepare release folder
       run: |
-        msys2do mkdir -p vangers/bin
-        msys2do cp /mingw32/bin/SDL2.dll vangers/bin/
-        msys2do cp /mingw32/bin/SDL2_net.dll vangers/bin/
-        msys2do cp /mingw32/bin/avcodec-58.dll vangers/bin/
-        msys2do cp /mingw32/bin/avformat-58.dll vangers/bin/
-        msys2do cp /mingw32/bin/avutil-56.dll vangers/bin/
-        msys2do cp /mingw32/bin/libogg-0.dll vangers/bin/
-        msys2do cp /mingw32/bin/libvorbis-0.dll vangers/bin/
-        msys2do cp /mingw32/bin/libvorbisfile-3.dll vangers/bin/
-        msys2do cp /mingw32/bin/zlib1.dll vangers/bin/
-        msys2do cp /mingw32/bin/libgcc_s_dw2-1.dll vangers/bin/
-        msys2do cp /mingw32/bin/libgcc_s_seh-1.dll vangers/bin/
-        msys2do cp /mingw32/bin/libstdc++-6.dll vangers/bin/
-        msys2do cp /mingw32/bin/libwinpthread-1.dll vangers/bin/
+        msys2 -c 'mkdir -p vangers/bin'
+        msys2 -c 'cp /mingw32/bin/SDL2.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/SDL2_net.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/avcodec-58.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/avformat-58.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/avutil-56.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/libogg-0.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/libvorbis-0.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/libvorbisfile-3.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/zlib1.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/libgcc_s_dw2-1.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/libgcc_s_seh-1.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/libstdc++-6.dll vangers/bin/'
+        msys2 -c 'cp /mingw32/bin/libwinpthread-1.dll vangers/bin/'
         cp clunk/build/libclunk.dll vangers/bin/
         cp build/src/vangers.exe vangers/bin/
-        msys2do strip vangers/bin/vangers.exe
+        msys2 -c 'strip vangers/bin/vangers.exe'
         cp build/server/vangers_server.exe vangers/bin/
-        msys2do strip vangers/bin/vangers_server.exe
+        msys2 -c 'strip vangers/bin/vangers_server.exe'
         cp build/surmap/surmap.exe vangers/bin/
     - uses: actions/upload-artifact@v1
       with:

.github/workflows/vangers_windows_64_build.yml

@@ -10,7 +10,7 @@ jobs:
       with:
         msystem: MINGW64
     - name: install libs
-      run: msys2do pacman --noconfirm -S
+      run: msys2 -c 'pacman --noconfirm -S
         mingw-w64-x86_64-ninja
         mingw-w64-x86_64-gcc
         mingw-w64-x86_64-SDL2
@@ -20,22 +20,22 @@ jobs:
         mingw-w64-x86_64-libvorbis
         mingw-w64-x86_64-nasm
         mingw-w64-x86_64-yasm
-        mingw-w64-x86_64-make
+        mingw-w64-x86_64-make'
     - uses: actions/checkout@v1
     - name: clunk -- download
       run: git clone --depth 1 https://github.com/stalkerg/clunk.git clunk
     - name: clunk -- create build dir
-      run: msys2do mkdir clunk/build
+      run: msys2 -c 'mkdir clunk/build'
     - name: clunk -- build and install
       run: |
-        msys2do cmake -DCMAKE_INSTALL_PREFIX=/mingw64 -G Ninja ..
-        msys2do ninja
-        msys2do ninja install
+        msys2 -c 'cmake -DCMAKE_INSTALL_PREFIX=/mingw64 -G Ninja ..'
+        msys2 -c 'ninja'
+        msys2 -c 'ninja install'
       working-directory: clunk/build
     - name: ffmpeg -- download
       run: git clone --depth 1 --branch n4.2.2 https://git.ffmpeg.org/ffmpeg.git ffmpeg
     - name: ffmpeg -- configure
-      run: msys2do ./configure --enable-shared --prefix=/mingw64
+      run: msys2 -c './configure --enable-shared --prefix=/mingw64'
         --disable-everything
         --enable-swscale
         --enable-zlib
@@ -50,38 +50,38 @@ jobs:
       working-directory: ffmpeg
     - name: ffmpeg -- build and install
       run: |
-        msys2do mingw32-make -j4
-        msys2do mingw32-make install
+        msys2 -c 'mingw32-make -j4'
+        msys2 -c 'mingw32-make install'
       working-directory: ffmpeg
     - name: vangers -- create build dir
-      run: msys2do mkdir build
+      run: msys2 -c 'mkdir build'
     - name: vangers -- configure
-      run: msys2do cmake -G Ninja ..
+      run: msys2 -c 'cmake -G Ninja ..'
       working-directory: build
     - name: vangers -- make
-      run: msys2do ninja
+      run: msys2 -c 'ninja'
       working-directory: build
     - name: vangers -- prepare release folder
       run: |
-        msys2do mkdir -p vangers/bin
-        msys2do cp /mingw64/bin/SDL2.dll vangers/bin/
-        msys2do cp /mingw64/bin/SDL2_net.dll vangers/bin/
-        msys2do cp /mingw64/bin/avcodec-58.dll vangers/bin/
-        msys2do cp /mingw64/bin/avformat-58.dll vangers/bin/
-        msys2do cp /mingw64/bin/avutil-56.dll vangers/bin/
-        msys2do cp /mingw64/bin/libogg-0.dll vangers/bin/
-        msys2do cp /mingw64/bin/libvorbis-0.dll vangers/bin/
-        msys2do cp /mingw64/bin/libvorbisfile-3.dll vangers/bin/
-        msys2do cp /mingw64/bin/zlib1.dll vangers/bin/
-        msys2do cp /mingw64/bin/libgcc_s_dw2-1.dll vangers/bin/
-        msys2do cp /mingw64/bin/libgcc_s_seh-1.dll vangers/bin/
-        msys2do cp /mingw64/bin/libstdc++-6.dll vangers/bin/
-        msys2do cp /mingw64/bin/libwinpthread-1.dll vangers/bin/
+        msys2 -c 'mkdir -p vangers/bin'
+        msys2 -c 'cp /mingw64/bin/SDL2.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/SDL2_net.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/avcodec-58.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/avformat-58.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/avutil-56.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/libogg-0.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/libvorbis-0.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/libvorbisfile-3.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/zlib1.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/libgcc_s_dw2-1.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/libgcc_s_seh-1.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/libstdc++-6.dll vangers/bin/'
+        msys2 -c 'cp /mingw64/bin/libwinpthread-1.dll vangers/bin/'
         cp clunk/build/libclunk.dll vangers/bin/
         cp build/src/vangers.exe vangers/bin/
-        msys2do strip vangers/bin/vangers.exe
+        msys2 -c 'strip vangers/bin/vangers.exe'
         cp build/server/vangers_server.exe vangers/bin/
-        msys2do strip vangers/bin/vangers_server.exe
+        msys2 -c 'strip vangers/bin/vangers_server.exe'
         cp build/surmap/surmap.exe vangers/bin/
     - uses: actions/upload-artifact@v1
       with: