From 8d3e22a3d913c1570cfce3d872e9dcd520313072 Mon Sep 17 00:00:00 2001
From: Huidae Cho <grass4u@gmail.com>
Date: Fri, 25 Dec 2020 11:06:59 -0500
Subject: [PATCH 1/2] OSGeo4W workflow: Archive artifacts

---
 .github/workflows/build_osgeo4w.sh | 4 +---
 .github/workflows/osgeo4w.yml      | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_osgeo4w.sh b/.github/workflows/build_osgeo4w.sh
index 74e4c6a3009..af1e741c1d2 100755
--- a/.github/workflows/build_osgeo4w.sh
+++ b/.github/workflows/build_osgeo4w.sh
@@ -131,9 +131,7 @@ sed -e 's/^\(call "%~dp0\)\(.*\)$/\1\\..\\..\\bin\2/' \
 ) > $grass_path/grass$ver.bat
 unix2dos $grass_path/grass$ver.bat
 
-exit
-
-# don't package for GitHub workflow; unnecessary
+# package for GitHub artifacts
 
 osgeo4w_basename=`basename $osgeo4w_path`
 date=`date +%Y%m%d`
diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index bdfc5f3cd4b..a81572263e0 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -31,6 +31,11 @@ jobs:
       run: C:\msys64\usr\bin\pacman.exe --noconfirm -S tar libintl make bison diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cairo mingw-w64-x86_64-python3-six
     - name: Compile GRASS GIS
       run: C:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') -p (Get-Location)
+    - name: Archive the built package
+      uses: actions/upload-artifact@v2
+      with:
+        name: grass-package
+        path: grass*.zip
     - name: Test executing of the grass command
       run: .github/workflows/test_simple.bat 'C:\OSGeo4W64\opt\grass\grass79.bat'
     - name: Run tests

From 76740ca32017ba917e711f0871853aeadc78a7c7 Mon Sep 17 00:00:00 2001
From: Huidae Cho <grass4u@gmail.com>
Date: Fri, 25 Dec 2020 12:49:25 -0500
Subject: [PATCH 2/2] Uploading a ZIP artifact compresses it again

---
 .github/workflows/build_osgeo4w.sh | 4 +++-
 .github/workflows/osgeo4w.yml      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_osgeo4w.sh b/.github/workflows/build_osgeo4w.sh
index af1e741c1d2..74e4c6a3009 100755
--- a/.github/workflows/build_osgeo4w.sh
+++ b/.github/workflows/build_osgeo4w.sh
@@ -131,7 +131,9 @@ sed -e 's/^\(call "%~dp0\)\(.*\)$/\1\\..\\..\\bin\2/' \
 ) > $grass_path/grass$ver.bat
 unix2dos $grass_path/grass$ver.bat
 
-# package for GitHub artifacts
+exit
+
+# don't package for GitHub workflow; unnecessary
 
 osgeo4w_basename=`basename $osgeo4w_path`
 date=`date +%Y%m%d`
diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index a81572263e0..28b695adbea 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -34,8 +34,8 @@ jobs:
     - name: Archive the built package
       uses: actions/upload-artifact@v2
       with:
-        name: grass-package
-        path: grass*.zip
+        name: grass-osgeo4w64
+        path: C:\OSGeo4W64
     - name: Test executing of the grass command
       run: .github/workflows/test_simple.bat 'C:\OSGeo4W64\opt\grass\grass79.bat'
     - name: Run tests