From 5017b9804eaa2e3d804dbd82ecdc8741b404d4ec Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia-Ripoll <juanjose.garciaripoll@gmail.com>
Date: Sun, 27 Dec 2020 19:39:00 +0100
Subject: [PATCH] build.yml now relies on emacs-build.cmd

---
 .github/workflows/build.yml | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 87ea450..66d5e3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     # https://github.com/msys2/MINGW-packages/blob/master/.github/workflows/main.yml
     strategy:
       matrix:
-        include: [{ msystem: MINGW64, arch: x86_64}]
+        include: [{ msystem: MINGW64, arch: x86_64 }]
 
     defaults:
       run:
@@ -32,45 +32,36 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      # Set up a minimal MSYS/MINGW environment
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.msystem }}
-          release: true
-          install: base-devel git mingw-w64-${{ matrix.arch }}-toolchain
-          update: true
-
       - name: See free space
         run: powershell -Command Get-PSDrive
 
-      # Collect dependencies
+      # This is the shortest job, but in this case it pulls all MSYS/MINGW64
       - name: Collect dependencies
-        run: msys2 -c './emacs-build.sh --debug --deps 2>&1'
+        run: .\emacs-build.cmd --clone
 
       - name: See free space
         run: powershell -Command Get-PSDrive
 
-      # Runs a single command using the runners shell
+      # Now download dependencies
       - name: Show we can write text
-        run: msys2 -c './emacs-build.sh --help'
-
-      # Clone emacs
-      - name: Clone emacs
-        run: msys2 -c './emacs-build.sh --clone 2>&1'
+        run: .\emacs-build.cmd --deps
 
       - name: See free space
         run: powershell -Command Get-PSDrive
 
-      # Build only emacs
-      - name: Build emacs
-        run: msys2 -c './emacs-build.sh --build 2>&1'
+      # Build an pack
+      - name: Show we can write text
+        run: .\emacs-build.cmd --build --pack-emacs
 
       - name: See free space
         run: powershell -Command Get-PSDrive
 
-      # Pack only emacs
-      - name: Pack emacs
-        run: msys2 -c './emacs-build.sh --pack-emacs 2>&1'
+      # Full emacs
+      - name: Clone emacs
+        run: .\emacs-build.cmd --pdf-tools --isync --mu --hunspell --pack-all
+
+      - name: See free space
+        run: powershell -Command Get-PSDrive
 
       # Upload everything
       - name: Upload binaries