From 8756d4ba530b3b36ba352b54d7d4a52c3a73a71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Milkovi=C4=8D?= Date: Tue, 13 Feb 2024 20:17:06 +0100 Subject: [PATCH 1/3] Debug github action workflow --- .github/workflows/Windows/install-deps.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/Windows/install-deps.sh b/.github/workflows/Windows/install-deps.sh index bcaf91410..3fb696f20 100644 --- a/.github/workflows/Windows/install-deps.sh +++ b/.github/workflows/Windows/install-deps.sh @@ -8,4 +8,11 @@ choco install --no-progress openssl 7zip # FindOpenSSL.cmake in the version we have available. This moves the files # where the finder expects them. Otherwise mismatch between OpenSSL versions # can and will happen. +set -x +ls -la "/c/Program Files/" +ls -la "/c/Program Files/OpenSSL/" +ls -la "/c/Program Files/OpenSSL/lib/" +ls -la "/c/Program Files/OpenSSL/lib/VC/" +ls -la "/c/Program Files/OpenSSL/lib/VC/x64/" +ls -la "/c/Program Files/OpenSSL/lib/VC/x64/MD/" cp "/c/Program Files/OpenSSL/lib/VC/x64/MD/*" "/c/Program Files/OpenSSL/lib/VC/x64/" From 79a5aa4763a55b9341f2e21611d17247437aadf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Milkovi=C4=8D?= Date: Wed, 14 Feb 2024 00:24:59 +0100 Subject: [PATCH 2/3] Putting expansion outside of quotes zsh seems to be fine with it but bash behaves differently --- .github/workflows/Windows/install-deps.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/Windows/install-deps.sh b/.github/workflows/Windows/install-deps.sh index 3fb696f20..541c9278e 100644 --- a/.github/workflows/Windows/install-deps.sh +++ b/.github/workflows/Windows/install-deps.sh @@ -8,11 +8,4 @@ choco install --no-progress openssl 7zip # FindOpenSSL.cmake in the version we have available. This moves the files # where the finder expects them. Otherwise mismatch between OpenSSL versions # can and will happen. -set -x -ls -la "/c/Program Files/" -ls -la "/c/Program Files/OpenSSL/" -ls -la "/c/Program Files/OpenSSL/lib/" -ls -la "/c/Program Files/OpenSSL/lib/VC/" -ls -la "/c/Program Files/OpenSSL/lib/VC/x64/" -ls -la "/c/Program Files/OpenSSL/lib/VC/x64/MD/" -cp "/c/Program Files/OpenSSL/lib/VC/x64/MD/*" "/c/Program Files/OpenSSL/lib/VC/x64/" +cp "/c/Program Files/OpenSSL/lib/VC/x64/MD"/* "/c/Program Files/OpenSSL/lib/VC/x64/" From eaef3fb4f20fba64b3c09288b3c110a2e752fd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Milkovi=C4=8D?= Date: Wed, 14 Feb 2024 00:33:21 +0100 Subject: [PATCH 3/3] Copy the files even 1 folder up --- .github/workflows/Windows/install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Windows/install-deps.sh b/.github/workflows/Windows/install-deps.sh index 541c9278e..b345d1976 100644 --- a/.github/workflows/Windows/install-deps.sh +++ b/.github/workflows/Windows/install-deps.sh @@ -8,4 +8,4 @@ choco install --no-progress openssl 7zip # FindOpenSSL.cmake in the version we have available. This moves the files # where the finder expects them. Otherwise mismatch between OpenSSL versions # can and will happen. -cp "/c/Program Files/OpenSSL/lib/VC/x64/MD"/* "/c/Program Files/OpenSSL/lib/VC/x64/" +cp "/c/Program Files/OpenSSL/lib/VC/x64/MD"/* "/c/Program Files/OpenSSL/lib/VC/"