From 33617a7a1c94a9e79bef71fbffa48033cf87dbdf Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Sun, 20 Dec 2020 16:52:56 +0100
Subject: [PATCH] ci: gh-actions: mingw: attempt to fix path

---
 .github/workflows/cmake-build-ci.gen | 7 ++++++-
 .github/workflows/cmake-build-ci.yml | 7 ++++++-
 CPack.txt                            | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 60cf68d0..657c8b07 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -405,12 +405,17 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           release: false
+          path-type: inherit
           install: >-
             rsync
             openssh
             mingw-w64-x86_64-toolchain
             git
-<?php steps(false);?>
+      - name: Prepare environment (for mingw on Windows)
+        run: |
+          echo "\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+  <?php steps(false);?>
 
   # linux release builds
   release:
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index f3e4b788..c3d78847 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -627,12 +627,17 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           release: false
+          path-type: inherit
           install: >-
             rsync
             openssh
             mingw-w64-x86_64-toolchain
             git
-      - name: Install dependencies (Linux)
+      - name: Prepare environment (for mingw on Windows)
+        run: |
+          echo "\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get install -my \
diff --git a/CPack.txt b/CPack.txt
index 09fb6207..247daa21 100644
--- a/CPack.txt
+++ b/CPack.txt
@@ -53,7 +53,7 @@ execute_process(
         OUTPUT_VARIABLE PROJECT_TAG
         ERROR_VARIABLE GIT_ERROR_OUTPUT
 )
-if(ERROR_OUTPUT)
+if(GIT_ERROR_OUTPUT)
     message(NOTICE "git describe: ${GIT_ERROR_OUTPUT}")
 endif()
 string(STRIP "${PROJECT_TAG}" PROJECT_TAG)
-- 
2.30.2