[commit: ghc] wip/jenkins: Rework handling of Windows (208f37a)

[kyra]

Hi, for quite a while I see a lot of windows-related commits touching 
Jenkinsfile, but *all* of them are wrong in windows path handling.

I know absolutely nothing about jenkins, but things like

PATH = 'C:\\msys64\\mingw64\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-x86_64:$PATH'

simply can't be correct.

It's impossible to use colon *both* as a path separator and drive letter 
designator. You should *either* have something like

PATH = 'C:\\msys64\\mingw64\\bin;C:\\msys64\\home\\ben\\ghc-8.0.2-x86_64;$PATH', using semicolon to separate path components,

*or*

PATH = '/c/msys64/mingw64/bin:/c/msys64/home/ben/ghc-8.0.2-x86_64:$PATH', using colon to separate path components, but getting rid of windows drive letter usage.

HTH


On 6/9/2017 10:25 AM, git at git.haskell.org wrote:
> Repository : ssh://git@git.haskell.org/ghc
>
> On branch  : wip/jenkins
> Link       : http://ghc.haskell.org/trac/ghc/changeset/208f37a6b666944f32fdca837760bb8b665b4f7b/ghc
>
>> ---------------------------------------------------------------
> commit 208f37a6b666944f32fdca837760bb8b665b4f7b
> Author: Ben Gamari <ben at smart-cactus.org>
> Date:   Mon May 29 13:08:49 2017 -0400
>
>      Rework handling of Windows
>
>
>> ---------------------------------------------------------------
> 208f37a6b666944f32fdca837760bb8b665b4f7b
>   Jenkinsfile | 13 ++++++++++---
>   1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/Jenkinsfile b/Jenkinsfile
> index 20dbec0..571cbb0 100644
> --- a/Jenkinsfile
> +++ b/Jenkinsfile
> @@ -30,10 +30,18 @@ parallel (
>     // Requires cygpath plugin?
>     // Make
>     "windows 64"         : {
> -    node(label: 'windows && amd64') {buildGhc(msys: 64)}
> +    environment {
> +      PATH = 'C:\\msys64\\mingw64\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-x86_64:$PATH'
> +    }
> +    node(label: 'windows && amd64') {buildGhc()}
>     },
>     "windows 32"         : {
> -    node(label: 'windows && amd64') {buildGhc(msys: 32)}
> +    node(label: 'windows && amd64') {
> +      environment {
> +        PATH = 'C:\\msys64\\mingw32\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-i386:$PATH'
> +      }
> +      buildGhc()
> +    }
>     },
>     //"osx"                : {node(label: 'darwin') {buildGhc(runNoFib: params.runNoFib)}}
>   )
> @@ -46,7 +54,6 @@ def buildGhc(params) {
>     boolean runNoFib = params?.runNofib ?: false
>     String crossTarget = params?.crossTarget
>     boolean unreg = params?.unreg ?: false
> -  String msys = params?.msys;
>   
>     stage('Checkout') {
>       checkout scm
>
> _______________________________________________
> ghc-commits mailing list
> ghc-commits at haskell.org
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-commits