From 94035c1db8e24dfcff3f2c8654de7eb83d902894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Fri, 4 Aug 2023 00:13:37 +0200
Subject: [PATCH] msys2: use xmake package instead of compiling from source

---
 .github/workflows/msys2-build.yml | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml
index 84e7dc422..509163072 100644
--- a/.github/workflows/msys2-build.yml
+++ b/.github/workflows/msys2-build.yml
@@ -45,37 +45,13 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.msystem }}
-        install: base-devel git unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain
+        install: base-devel git unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain mingw-w64-${{ matrix.arch }}-xmake
         update: true
 
     # Force xmake to a specific folder (for cache)
     - name: Set xmake env
       run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
 
-    # Cache xmake build
-    - name: Retrieve cached xmake build
-      uses: actions/cache@v3
-      id: xmake_cache
-      with:
-        path: ${{ github.workspace }}/xmake_git
-        key: MinGW-XMake-W${{ steps.cache_key.outputs.key }}
-
-    # Build xmake
-    - name: Setup xmake
-      if: steps.xmake_cache.outputs.cache-hit != 'true'
-      run: |
-        git clone https://github.com/xmake-io/xmake.git --recurse-submodules -b dev xmake_git
-        cd xmake_git
-        ./configure
-        make -j4
-
-    # Install xmake
-    - name: Install xmake
-      run: |
-        cd xmake_git
-        make install PREFIX=/${{ matrix.msystem }}
-        xmake --version
-
     # Update xmake repository (in order to have the file that will be cached)
     - name: Update xmake repository
       run: xmake repo --update