From e3ec4ebd210e57f2399b232232ef1893a86a2bee Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 5 Jan 2024 14:47:30 +0100 Subject: [PATCH] build: Make msys2 deps install script use pacboy --- .github/workflows/build.yml | 20 ++++++-------------- dist/get_deps_msys2.sh | 35 ++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6eb2a2ae..1576000b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,20 +45,12 @@ jobs: uses: msys2/setup-msys2@v2 with: msystem: mingw64 - pacboy: >- - gcc:p - lld:p - cmake:p - ccache:p - glfw:p - file:p - mbedtls:p - freetype:p - dlfcn:p - libbacktrace:p - ninja:p - curl-winssl:p - capstone:p + + - name: ⬇️ Install dependencies + run: | + set -x + pacman -Syu --noconfirm + dist/get_deps_msys2.sh - name: ⬇️ Install .NET uses: actions/setup-dotnet@v3 diff --git a/dist/get_deps_msys2.sh b/dist/get_deps_msys2.sh index 1f985f437..d63957847 100755 --- a/dist/get_deps_msys2.sh +++ b/dist/get_deps_msys2.sh @@ -1,19 +1,20 @@ #!/usr/bin/env sh -pacman -S --needed --noconfirm \ - mingw-w64-x86_64-gcc \ - mingw-w64-x86_64-lld \ - mingw-w64-x86_64-cmake \ - mingw-w64-x86_64-ccache \ - mingw-w64-x86_64-glfw \ - mingw-w64-x86_64-file \ - mingw-w64-x86_64-curl-winssl \ - mingw-w64-x86_64-mbedtls \ - mingw-w64-x86_64-freetype \ - mingw-w64-x86_64-dlfcn \ - mingw-w64-x86_64-ninja \ - mingw-w64-x86_64-capstone \ - mingw-w64-x86_64-zlib \ - mingw-w64-x86_64-bzip2 \ - mingw-w64-x86_64-xz \ - mingw-w64-x86_64-zstd +pacman -S --needed --noconfirm pactoys +pacboy -S --needed --noconfirm \ + gcc:p \ + lld:p \ + cmake:p \ + ccache:p \ + glfw:p \ + file:p \ + curl-winssl:p \ + mbedtls:p \ + freetype:p \ + dlfcn:p \ + ninja:p \ + capstone:p \ + zlib:p \ + bzip2:p \ + xz:p \ + zstd:p