Skip to content

Commit 8f2db49

Browse files
authored
msys2 actions cleanup (#7934)
1 parent a1b323c commit 8f2db49

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

.github/workflows/build-msys2.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,14 @@ jobs:
4141
- uses: msys2/setup-msys2@v2
4242
with:
4343
cache: true
44+
release: true
4445
update: false
4546
msystem: ${{matrix.msystem}}
46-
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
47+
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
48+
install: >-
49+
unzip
50+
make
51+
# gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p
4752
# boost:p tools:p
4853
# install: >-
4954
# unzip
@@ -60,3 +65,4 @@ jobs:
6065
- name: Run tests
6166
run: ./scripts/ci/msys2/run_tests.sh
6267

68+

scripts/msys2/install_dependencies.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@ while [[ $# > 0 ]] ; do
3131
done
3232

3333
# List of MSYS packages to be installed
34-
msyspackages="make rsync zip unzip wget"
34+
# msyspackages="make rsync zip unzip wget"
35+
msyspackages="unzip make"
3536

3637
# List of MINGW packages to be installed (without prefix)
37-
mingwPackages="assimp cairo curl freeglut FreeImage \
38-
gcc gdb glew glfw glm \
39-
harfbuzz libsndfile libusb libxml2 mpg123 \
40-
nlohmann-json ntldd-git openal opencv \
41-
pkgconf pugixml rtaudio \
42-
uriparser utf8cpp zlib"
38+
mingwPackages="gcc assimp cairo curl freeglut FreeImage \
39+
glew glfw glm \
40+
harfbuzz libsndfile libusb libxml2 mpg123 \
41+
nlohmann-json openal opencv \
42+
pkgconf pugixml rtaudio \
43+
uriparser utf8cpp "
44+
# gdb zlib ntldd-git
4345
# boost poco tools
4446
# Build the full list of packages adding prefix to MINGW packages
4547
packages=${msyspackages}

0 commit comments

Comments
 (0)