From d4049ce896ae7c9c455bab3700aa5f23bbebf191 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Wed, 8 Apr 2020 15:04:44 +0200
Subject: [PATCH] GitHub Workflow: check Win module paths on runtime

JACK (and other modules) may or may not be present depending on previous
workflows' steps. Therefore do the check everytime the action is run -
since the MSYS may be cached as well, this is done in bashrc.
---
 .github/scripts/Windows/prepare_msys.sh | 14 +++++++-------
 .github/workflows/ccpp.yml              |  2 +-
 .github/workflows/nightly.yml           |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh
index 2163f82a9..eeff35d7d 100644
--- a/.github/scripts/Windows/prepare_msys.sh
+++ b/.github/scripts/Windows/prepare_msys.sh
@@ -8,26 +8,26 @@ export PATH=/mingw64/bin:/usr/local/bin:$PATH
 export CPATH=/usr/local/include
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/mingw64/lib/pkgconfig
 export LIBRARY_PATH=/usr/local/lib
-EOF
 
 CUDA_D=$(ls -d /c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/*)
 if test -d "$CUDA_D"; then
-        echo "export CPATH=\$CPATH:'$CUDA_D/include'" >> ~/.bash_profile
+        export CPATH=$CPATH:$CUDA_D/include
 fi
 
 if test -d /c/Program\ Files/NewTek; then
         NDI_D=$(ls -d /c/Program\ Files/NewTek/*SDK)
-        echo "export CPATH=\$CPATH:'$NDI_D/Include'" >> ~/.bash_profile
-        echo "export LIBRARY_PATH=\$LIBRARY_PATH:'$NDI_D/Lib/x64'" >> ~/.bash_profile
+        export CPATH=$CPATH:$NDI_D/Include
+        export LIBRARY_PATH=$LIBRARY_PATH:$NDI_D/Lib/x64
 fi
 
 JACK_D=/c/Program\ Files\ \(x86\)/Jack
 if test -d "$JACK_D"; then
-        echo "export CPATH=\$CPATH:'$JACK_D/includes'" >> ~/.bash_profile
-        echo "export LIBRARY_PATH=\$LIBRARY_PATH:'$JACK_D/lib'" >> ~/.bash_profile
+        export CPATH=$CPATH:$JACK_D/includes
+        export LIBRARY_PATH=$LIBRARY_PATH:$JACK_D/lib
 fi
 
-echo cd `cygpath $GITHUB_WORKSPACE` >> ~/.bash_profile
+cd `cygpath $GITHUB_WORKSPACE`
+EOF
 
 . ~/.bash_profile
 
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index aa69aba03..cde8875b1 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -169,7 +169,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: C:\msys64
-        key: cache-msys2
+        key: cache-msys2-3
     - name: bootsrap MSYS2
       if: steps.cache-msys2.outputs.cache-hit != 'true'
       run: |
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 15bf64a2f..37fe3e74e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -150,7 +150,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: C:\msys64
-        key: cache-msys2
+        key: cache-msys2-3
     - name: bootsrap MSYS2
       if: steps.cache-msys2.outputs.cache-hit != 'true'
       run: |