From b303af425580b9c1d249f9248c5de4a39d4f763b Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 23:41:25 -0300 Subject: [PATCH 1/7] msys2 actions --- .github/workflows/build-msys2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index 6bec16d4557..3899e9d1b2f 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -41,6 +41,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: cache: true + release: false 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 From 3fbb8c4d8fe748c04591cd9490f27d6157c398de Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 7 May 2024 00:06:32 -0300 Subject: [PATCH 2/7] second run --- .github/workflows/build-msys2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index 3899e9d1b2f..be28f5c9787 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -61,3 +61,4 @@ jobs: - name: Run tests run: ./scripts/ci/msys2/run_tests.sh + From ca53762d3a81c782a991c85cdd9383f2c30426e4 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 7 May 2024 01:16:08 -0300 Subject: [PATCH 3/7] less packages --- .github/workflows/build-msys2.yml | 5 +++-- scripts/msys2/install_dependencies.sh | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index be28f5c9787..9174152f053 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -41,10 +41,11 @@ jobs: - uses: msys2/setup-msys2@v2 with: cache: true - release: false + 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: 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 + # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p # boost:p tools:p # install: >- # unzip diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh index f688ff5aead..e640be2ab90 100644 --- a/scripts/msys2/install_dependencies.sh +++ b/scripts/msys2/install_dependencies.sh @@ -31,15 +31,16 @@ while [[ $# > 0 ]] ; do done # List of MSYS packages to be installed -msyspackages="make rsync zip unzip wget" +# msyspackages="make rsync zip unzip wget" # 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" + glew glfw glm \ + harfbuzz libsndfile libusb libxml2 mpg123 \ + nlohmann-json openal opencv \ + pkgconf pugixml rtaudio \ + uriparser utf8cpp " +# gcc gdb zlib ntldd-git # boost poco tools # Build the full list of packages adding prefix to MINGW packages packages=${msyspackages} From f30710538957fedc7503c769bc3d1ed670fbf7c3 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 7 May 2024 01:32:20 -0300 Subject: [PATCH 4/7] up --- .github/workflows/build-msys2.yml | 2 ++ scripts/msys2/install_dependencies.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index 9174152f053..f1c3e58f4bf 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -45,6 +45,8 @@ jobs: update: false msystem: ${{matrix.msystem}} pacboy: 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 # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p # boost:p tools:p # install: >- diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh index e640be2ab90..1add346cc78 100644 --- a/scripts/msys2/install_dependencies.sh +++ b/scripts/msys2/install_dependencies.sh @@ -32,6 +32,7 @@ done # List of MSYS packages to be installed # msyspackages="make rsync zip unzip wget" +msyspackages="unzip" # List of MINGW packages to be installed (without prefix) mingwPackages="assimp cairo curl freeglut FreeImage \ From b8ce8819394b96838a2940768de7d7680a7bbc5f Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 7 May 2024 01:42:25 -0300 Subject: [PATCH 5/7] make back --- .github/workflows/build-msys2.yml | 1 + scripts/msys2/install_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index f1c3e58f4bf..da868b9c58a 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -47,6 +47,7 @@ jobs: pacboy: 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: >- diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh index 1add346cc78..5274a76cf28 100644 --- a/scripts/msys2/install_dependencies.sh +++ b/scripts/msys2/install_dependencies.sh @@ -32,7 +32,7 @@ done # List of MSYS packages to be installed # msyspackages="make rsync zip unzip wget" -msyspackages="unzip" +msyspackages="unzip make" # List of MINGW packages to be installed (without prefix) mingwPackages="assimp cairo curl freeglut FreeImage \ From e8e6cd971000cd0eca983fa810b209c8c1ada4b7 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 7 May 2024 01:51:23 -0300 Subject: [PATCH 6/7] more --- .github/workflows/build-msys2.yml | 1 + scripts/msys2/install_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index da868b9c58a..ca5123ef666 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -48,6 +48,7 @@ jobs: install: >- unzip make + gcc # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p # boost:p tools:p # install: >- diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh index 5274a76cf28..2918751c31a 100644 --- a/scripts/msys2/install_dependencies.sh +++ b/scripts/msys2/install_dependencies.sh @@ -32,7 +32,7 @@ done # List of MSYS packages to be installed # msyspackages="make rsync zip unzip wget" -msyspackages="unzip make" +msyspackages="unzip make gcc" # List of MINGW packages to be installed (without prefix) mingwPackages="assimp cairo curl freeglut FreeImage \ From e15d6227c4b916d78764e134a0c1c3ff6b203c80 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 7 May 2024 02:03:21 -0300 Subject: [PATCH 7/7] up --- .github/workflows/build-msys2.yml | 3 +-- scripts/msys2/install_dependencies.sh | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml index ca5123ef666..b2a9d0820c3 100644 --- a/.github/workflows/build-msys2.yml +++ b/.github/workflows/build-msys2.yml @@ -44,11 +44,10 @@ jobs: release: true update: false msystem: ${{matrix.msystem}} - pacboy: 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 + 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 # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p # boost:p tools:p # install: >- diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh index 2918751c31a..33cc7954adb 100644 --- a/scripts/msys2/install_dependencies.sh +++ b/scripts/msys2/install_dependencies.sh @@ -32,16 +32,16 @@ done # List of MSYS packages to be installed # msyspackages="make rsync zip unzip wget" -msyspackages="unzip make gcc" +msyspackages="unzip make" # List of MINGW packages to be installed (without prefix) -mingwPackages="assimp cairo curl freeglut FreeImage \ +mingwPackages="gcc assimp cairo curl freeglut FreeImage \ glew glfw glm \ harfbuzz libsndfile libusb libxml2 mpg123 \ nlohmann-json openal opencv \ pkgconf pugixml rtaudio \ uriparser utf8cpp " -# gcc gdb zlib ntldd-git +# gdb zlib ntldd-git # boost poco tools # Build the full list of packages adding prefix to MINGW packages packages=${msyspackages}