From b72a5adddf1d5220b0e7573648ff01940a9834cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Mon, 1 Jan 2024 23:30:04 -0500
Subject: [PATCH] Update osgeo4w.yml reenable compilation

---
 .github/workflows/osgeo4w.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index 62291cb6c5e..f5aba7c5854 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -193,16 +193,23 @@ jobs:
             !${{ env.PackageDir }}/**/gdal-dev/**
             !${{ env.PackageDir }}/**/setup.ini
 
-      #- name: Compile GRASS GIS
-      #  run: .github/workflows/build_osgeo4w.sh .
+      - name: Compile GRASS GIS
+        run: .github/workflows/build_osgeo4w.sh .
+        shell: msys2 {0}
+        env:
+          MAKEFLAGS: -j0
         #run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location)
 
-      #- name: Test executing of the grass command
-      #  run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass84.bat'
+      - name: Test executing of the grass command
+        run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass84.bat'
+        #shell: msys2 {0}
       #- run: exit 1
-      #- name: Test executing of the grass command in bash
+      - name: Test executing of the grass command in bash
+        run: .github/workflows/test_simple.sh
+        shell: msys2 {0}
        # run: D:\msys64\usr\bin\bash.exe .github/workflows/test_simple.sh
 
-      #- name: Run tests
+      - name: Run tests
+        run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass84.bat' 'C:\OSGeo4W\bin\python3'
         #run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass84.bat' 'C:\OSGeo4W\bin\python3'
       
\ No newline at end of file