Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -60,3 +65,4 @@ jobs:
- name: Run tests
run: ./scripts/ci/msys2/run_tests.sh


16 changes: 9 additions & 7 deletions scripts/msys2/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down