From f1f8d70a41ded7212b2f9298e1927bfe41c2cd8c Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Tue, 28 May 2019 10:40:18 +0100 Subject: [PATCH] ci: remove msys workaround (#30510) Verified it isn't a problem anymore https://github.com/docker/for-win/issues/2920 PR Close #30510 --- .codefresh/Dockerfile.win-1809 | 7 +------ .codefresh/fix-msys64.cmd | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .codefresh/fix-msys64.cmd diff --git a/.codefresh/Dockerfile.win-1809 b/.codefresh/Dockerfile.win-1809 index 44202e0ec1..eff6e1771a 100644 --- a/.codefresh/Dockerfile.win-1809 +++ b/.codefresh/Dockerfile.win-1809 @@ -117,9 +117,4 @@ RUN Invoke-WebRequest -UseBasicParsing https://www.python.org/ftp/python/3.5.1/p Start-Process python-3.5.1.exe -ArgumentList '/quiet InstallAllUsers=1 PrependPath=1' -Wait; ` Remove-Item -Force python-3.5.1.exe -# Add a fix for https://github.com/docker/for-win/issues/2920 as entry point to the container. -SHELL ["cmd", "/c"] -COPY "fix-msys64.cmd" "C:\\fix-msys64.cmd" -ENTRYPOINT cmd /C C:\\fix-msys64.cmd && cmd /c - -CMD ["cmd.exe"] \ No newline at end of file +CMD ["cmd.exe"] diff --git a/.codefresh/fix-msys64.cmd b/.codefresh/fix-msys64.cmd deleted file mode 100644 index 3869596d08..0000000000 --- a/.codefresh/fix-msys64.cmd +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -REM Fix for https://github.com/docker/for-win/issues/2920 -REM echo "Fixing msys64 folder..." -REM Touch all .dll files inside C:\msys64\ -forfiles /p C:\msys64\ /s /m *.dll /c "cmd /c Copy /B @path+,, >NUL" -REM echo "Fixed msys64 folder." \ No newline at end of file