From 476980db90d513de333684db151f7c47f4538298 Mon Sep 17 00:00:00 2001
From: Simon Sobisch <simonsobisch@web.de>
Date: Sun, 29 Sep 2024 19:31:10 +0000
Subject: [PATCH] use ci dist for MSYS1

---
 .github/workflows/windows-msys1.yml | 43 +++++++++++++++++++----------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/windows-msys1.yml b/.github/workflows/windows-msys1.yml
index e51995f12..ca178d766 100644
--- a/.github/workflows/windows-msys1.yml
+++ b/.github/workflows/windows-msys1.yml
@@ -42,13 +42,26 @@ jobs:
 
     steps:
 
-      - name: Set git user
-        run: |
-          git config --global user.name github-actions
-          git config --global user.email github-actions-bot@users.noreply.github.com
+      #- name: Set git user
+      #  run: |
+      #    git config --global user.name github-actions
+      #    git config --global user.email github-actions-bot@users.noreply.github.com
+
+      #- name: Checkout code
+      #  uses: actions/checkout@v4
 
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Get CI dist tarball
+        uses: actions/download-artifact@v4
+        with:
+          name: gnucobol-ci source distribution
+
+      - name: Build environment setup
+        run: |
+          tar -xvf gnucobol*.tar.*  --strip-components=1
+          mkdir build
+          # sed -i 'N;s/else/else :;/g' .\configure
+          # sed -i 's/\} else \:;/} else/g' .\configure
+          # sed -i 's/#else \:;/#else/g' .\configure
 
       - name: Setup environment
         shell: pwsh
@@ -255,18 +268,18 @@ jobs:
           curl -L https://raw.githubusercontent.com/DaveGamble/cJSON/v%MINGW_CJSON_VERS%/cJSON.h -o .\libcob\cJSON.h
 
 
-      - name: Bootstrap GnuCOBOL
-        run: |
-          sed -i 's/AM_PROG_AR/m4_ifdef\(\[AM_PROG_AR\], \[AM_PROG_AR\]\)/g' .\configure.ac
-          sed -i 's/po extras doc tests/po extras tests/g' .\Makefile.am
-          bash -lc "./autogen.sh"
+      # - name: Bootstrap GnuCOBOL
+      #   run: |
+      #     sed -i 's/AM_PROG_AR/m4_ifdef\(\[AM_PROG_AR\], \[AM_PROG_AR\]\)/g' .\configure.ac
+      #     sed -i 's/po extras doc tests/po extras tests/g' .\Makefile.am
+      #     bash -lc "./autogen.sh"
 
       - name: Configure GnuCOBOL
         run: |
-          mkdir build
-          sed -i 'N;s/else/else :;/g' .\configure
-          sed -i 's/\} else \:;/} else/g' .\configure
-          sed -i 's/#else \:;/#else/g' .\configure
+          rem mkdir build
+          rem sed -i 'N;s/else/else :;/g' .\configure
+          rem sed -i 's/\} else \:;/} else/g' .\configure
+          rem sed -i 's/#else \:;/#else/g' .\configure
           rem extra setting CPPFLAGS as " are wrong here
           bash -lc "cd build && ../configure CPPFLAGS=\"-I../libcob\" %CFGOPT% --with-db --with-xml2 --with-json=local --with-curses=pdcurses --prefix=/mingw"