From 8fc7dccd131c7ee7063193f284855da7821182e1 Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Wed, 23 Sep 2020 22:02:27 +1000
Subject: [PATCH] CLI workflow: fix MSYS2 job

---
 .github/workflows/cli_setup.yml | 34 ++++++++++++++++++---------------
 setup_msys.sh                   | 15 ---------------
 2 files changed, 19 insertions(+), 30 deletions(-)
 delete mode 100644 setup_msys.sh

diff --git a/.github/workflows/cli_setup.yml b/.github/workflows/cli_setup.yml
index d9dd02d..857ac1c 100644
--- a/.github/workflows/cli_setup.yml
+++ b/.github/workflows/cli_setup.yml
@@ -24,15 +24,15 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install python dependencies
+    - name: Install Python dependencies
       run: |
-        python -m pip install wheel
+        python3 -m pip install wheel
         echo "::add-path::$HOME/.local/bin"
 
     - name: Install QMK CLI from source
       run: |
         python3 -m pip install -r requirements.txt
-        python setup.py sdist bdist_wheel
+        python3 setup.py sdist bdist_wheel
         cd ..
         python3 -m pip install --force-reinstall --no-index --no-deps --prefix=~/.local --find-links qmk_cli/dist qmk
 
@@ -41,28 +41,32 @@ jobs:
 
   test_cli_win:
     runs-on: windows-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.8]
+    env:
+      QMK_HOME: $HOME/qmk_firmware
 
     steps:
     - uses: actions/checkout@v1
 
-    - name: Set up MSYS2
-      uses: qmk/setup-msys2@v1
+    - name: (MSYS2) Setup and install dependencies
+      uses: msys2/setup-msys2@v2
       with:
         update: true
-
-    - name: (MSYS2) Install git and python3
-      run: msys2do pacman -S git python3-pip --noconfirm
+        install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip
 
     - name: (MSYS2) Upgrade pip and setuptools and install wheel
+      shell: msys2 {0}
       run: |
-        msys2do python3 -m pip install --upgrade pip setuptools
-        msys2do python3 -m pip install wheel
+        python3 -m pip install --upgrade pip setuptools
+        python3 -m pip install wheel
 
     - name: (MSYS2) Install QMK CLI from source
-      run: msys2do ./setup_msys.sh $(cygpath "${{ github.workspace }}")
+      shell: msys2 {0}
+      run: |
+        python3 -m pip install -r requirements.txt
+        python3 setup.py sdist bdist_wheel
+        cd ..
+        python3 -m pip install --force-reinstall --no-index --no-deps --find-links qmk_cli/dist qmk
 
     - name: (MSYS2) Run qmk setup -y
-      run: msys2do qmk setup -y
+      shell: msys2 {0}
+      run: qmk setup -y
diff --git a/setup_msys.sh b/setup_msys.sh
deleted file mode 100644
index a2c77dc..0000000
--- a/setup_msys.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-cp -r $1 ~/qmk_cli
-
-export PATH=~/.local/bin:$PATH
-echo "PATH=$PATH" >> ~/.bashrc
-
-export QMK_HOME=~/qmk_firmware
-export CLI_DIR=~/qmk_cli
-
-cd $CLI_DIR
-python3 -m pip install -r requirements.txt
-python3 setup.py sdist bdist_wheel
-cd ~
-python3 -m pip install --force-reinstall --no-index --no-deps --prefix=~/.local --find-links qmk_cli/dist qmk