From bd6390f89b84365c992a126e9984eaae8100259c Mon Sep 17 00:00:00 2001 From: Sergey Stepanov Date: Mon, 27 Apr 2020 13:12:40 +0300 Subject: [PATCH] Fix gh CI scripts for a non-standard shell --- .github/workflows/build.yml | 11 +++++++++-- .github/workflows/release.yml | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f785afcd..98ce7a02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,6 +50,7 @@ jobs: with: msystem: MINGW64 path-type: inherit + update: true - name: Load Go modules maybe? uses: actions/cache@v1 @@ -61,8 +62,14 @@ jobs: - name: Build Windows app if: matrix.os == 'windows-latest' - run: | - msys2do pacman -Sy --noconfirm --needed make mingw-w64-x86_64-{gcc,pkg-config,dlfcn,libvpx,opusfile} + run: > + msys2do pacman -S --noconfirm --needed make + mingw-w64-x86_64-gcc + mingw-w64-x86_64-pkg-config + mingw-w64-x86_64-dlfcn + mingw-w64-x86_64-libvpx + mingw-w64-x86_64-opusfile + msys2do make build - name: Build Linux app diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3d2396b..41f91901 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,6 +68,7 @@ jobs: with: msystem: MINGW64 path-type: inherit + update: true - name: Load Go modules maybe? uses: actions/cache@v1 @@ -79,8 +80,14 @@ jobs: - name: Build Windows app if: matrix.os == 'windows-latest' - run: | - msys2do pacman -Sy --noconfirm --needed make mingw-w64-x86_64-{gcc,pkg-config,dlfcn,libvpx,opusfile} + run: > + msys2do pacman -S --noconfirm --needed make + mingw-w64-x86_64-gcc + mingw-w64-x86_64-pkg-config + mingw-w64-x86_64-dlfcn + mingw-w64-x86_64-libvpx + mingw-w64-x86_64-opusfile + msys2do make release RELEASE_DIR=${{ env.release-dir }} DLIB_SEARCH_PATTERN=/mingw.*dll CORE_EXT=dll - name: Build Linux app