diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index 6bec16d4557..b2a9d0820c3 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -41,9 +41,14 @@ jobs: - uses: msys2/setup-msys2@v2 with: cache: true + release: true update: false msystem: ${{matrix.msystem}} - pacboy: assimp:p cairo:p curl:p freeglut:p FreeImage:p gcc:p gdb:p glew:p glfw:p glm:p harfbuzz:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p ntldd-git:p openal:p opencv:p pkgconf:p pugixml:p rtaudio:p uriparser:p utf8cpp:p zlib:p poco:p + pacboy: gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p + install: >- + unzip + make + # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p # boost:p tools:p # install: >- # unzip @@ -60,3 +65,4 @@ jobs: - name: Run tests run: ./scripts/ci/msys2/run_tests.sh + diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh index f688ff5aead..33cc7954adb 100644 --- a/scripts/msys2/install_dependencies.sh +++ b/scripts/msys2/install_dependencies.sh @@ -31,15 +31,17 @@ while [[ $# > 0 ]] ; do done # List of MSYS packages to be installed -msyspackages="make rsync zip unzip wget" +# msyspackages="make rsync zip unzip wget" +msyspackages="unzip make" # List of MINGW packages to be installed (without prefix) -mingwPackages="assimp cairo curl freeglut FreeImage \ - gcc gdb glew glfw glm \ - harfbuzz libsndfile libusb libxml2 mpg123 \ - nlohmann-json ntldd-git openal opencv \ - pkgconf pugixml rtaudio \ - uriparser utf8cpp zlib" +mingwPackages="gcc assimp cairo curl freeglut FreeImage \ + glew glfw glm \ + harfbuzz libsndfile libusb libxml2 mpg123 \ + nlohmann-json openal opencv \ + pkgconf pugixml rtaudio \ + uriparser utf8cpp " +# gdb zlib ntldd-git # boost poco tools # Build the full list of packages adding prefix to MINGW packages packages=${msyspackages}