From aa95e9eb49413dff73acc5d6096b2649ceb9c2cf Mon Sep 17 00:00:00 2001 From: Justin Blanchard Date: Tue, 5 Jan 2021 01:36:55 -0500 Subject: [PATCH] Revert "Try a goofy workaround suggeted in the https://github.com/msys2/setup-msys2/issues/99 thread." This reverts commit 39e07730836149cfb90a4b37e565d38dce421fc7. --- .github/workflows/naev_ci.yml | 2 +- .github/workflows/naev_prerelease.yml | 2 +- .github/workflows/naev_release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/naev_ci.yml b/.github/workflows/naev_ci.yml index 03d2ff366f..511c93c112 100644 --- a/.github/workflows/naev_ci.yml +++ b/.github/workflows/naev_ci.yml @@ -69,7 +69,7 @@ jobs: msystem: MINGW64 update: true path-type: strict - install: mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libtool mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libpng mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-binutils mingw-w64-x86_64-itstool mingw-w64-x86_64-freetype mingw-w64-x86_64-gettext mingw-w64-x86_64-make mingw-w64-x86_64-pkg-config autoconf autoconf-archive automake-wrapper git intltool tar + install: mingw-w64-x86_64-libtool mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libpng mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-binutils mingw-w64-x86_64-itstool mingw-w64-x86_64-freetype mingw-w64-x86_64-gettext mingw-w64-x86_64-make mingw-w64-x86_64-pkg-config autoconf autoconf-archive automake-wrapper git intltool tar - name: Install Homebrew Packages if: ${{ runner.os == 'macOS'}} diff --git a/.github/workflows/naev_prerelease.yml b/.github/workflows/naev_prerelease.yml index adef445b97..e612e8701b 100644 --- a/.github/workflows/naev_prerelease.yml +++ b/.github/workflows/naev_prerelease.yml @@ -147,7 +147,7 @@ jobs: with: msystem: MINGW64 update: true - install: mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libtool mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libpng mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-binutils mingw-w64-x86_64-itstool mingw-w64-x86_64-freetype mingw-w64-x86_64-gettext mingw-w64-x86_64-python-pip mingw-w64-x86_64-luajit mingw-w64-x86_64-nsis mingw-w64-x86_64-make mingw-w64-x86_64-pkg-config mingw-w64-x86_64-suitesparse autoconf autoconf-archive automake-wrapper git intltool python tar + install: mingw-w64-x86_64-libtool mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libpng mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-binutils mingw-w64-x86_64-itstool mingw-w64-x86_64-freetype mingw-w64-x86_64-gettext mingw-w64-x86_64-python-pip mingw-w64-x86_64-luajit mingw-w64-x86_64-nsis mingw-w64-x86_64-make mingw-w64-x86_64-pkg-config mingw-w64-x86_64-suitesparse autoconf autoconf-archive automake-wrapper git intltool python tar - name: Install Homebrew Packages if: ${{ runner.os == 'macOS'}} diff --git a/.github/workflows/naev_release.yml b/.github/workflows/naev_release.yml index f1547f3bfb..a4a9d6fe47 100644 --- a/.github/workflows/naev_release.yml +++ b/.github/workflows/naev_release.yml @@ -149,7 +149,7 @@ jobs: with: msystem: MINGW64 update: true - install: mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libtool mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libpng mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-binutils mingw-w64-x86_64-itstool mingw-w64-x86_64-freetype mingw-w64-x86_64-gettext mingw-w64-x86_64-python-pip mingw-w64-x86_64-luajit mingw-w64-x86_64-nsis mingw-w64-x86_64-make mingw-w64-x86_64-pkg-config mingw-w64-x86_64-suitesparse autoconf autoconf-archive automake-wrapper git intltool python tar + install: mingw-w64-x86_64-libtool mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libpng mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-binutils mingw-w64-x86_64-itstool mingw-w64-x86_64-freetype mingw-w64-x86_64-gettext mingw-w64-x86_64-python-pip mingw-w64-x86_64-luajit mingw-w64-x86_64-nsis mingw-w64-x86_64-make mingw-w64-x86_64-pkg-config mingw-w64-x86_64-suitesparse autoconf autoconf-archive automake-wrapper git intltool python tar - name: Install Homebrew Packages if: ${{ runner.os == 'macOS'}}