Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -10,8 +10,13 @@ variables:
    10 10
         paths:
    
    11 11
           - snapshot/
    
    12 12
       script:
    
    13
    -    - wget -nv $download_url/cmucl-$version-$osname.tar.bz2
    
    14
    -    - wget -nv $download_url/cmucl-$version-$osname.extra.tar.bz2
    
    13
    +    - echo PATH = $PATH
    
    14
    +    - ls -F /usr/local/bin
    
    15
    +    - type -all gitlab-runner
    
    16
    +    - $CURL -o cmucl-$version-$osname.tar.bz2 $download_url/cmucl-$version-$osname.tar.bz2
    
    17
    +    - $CURL -o cmucl-$version-$osname.extra.tar.bz2 $download_url/cmucl-$version-$osname.extra.tar.bz2
    
    18
    +    #- wget -nv $download_url/cmucl-$version-$osname.tar.bz2
    
    19
    +    #- wget -nv $download_url/cmucl-$version-$osname.extra.tar.bz2
    
    15 20
         - mkdir snapshot
    
    16 21
         - (cd snapshot; tar xjf ../cmucl-$version-$osname.tar.bz2; tar xjf ../cmucl-$version-$osname.extra.tar.bz2)
    
    17 22
     
    
    ... ... @@ -102,6 +107,7 @@ linux:install:
    102 107
         - linux
    
    103 108
       variables:
    
    104 109
         osname: "linux"
    
    110
    +    CURL: "curl"
    
    105 111
     
    
    106 112
     linux:build:
    
    107 113
       <<: *build_configuration
    
    ... ... @@ -193,19 +199,12 @@ linux:benchmark:
    193 199
         - job: linux:build
    
    194 200
     
    
    195 201
     osx:install:
    
    196
    -  stage: install
    
    202
    +  <<: *install_configuration
    
    197 203
       tags:
    
    198 204
         - macos-virtualbox
    
    199
    -  artifacts:
    
    200
    -    paths:
    
    201
    -      - snapshot/
    
    202
    -  script:
    
    203
    -    - echo PATH = $PATH
    
    204
    -    - ls -F /usr/local/bin
    
    205
    -    - type -all gitlab-runner
    
    206
    -    - /opt/local/bin/curl -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2
    
    207
    -    - mkdir snapshot
    
    208
    -    - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2)
    
    205
    +  variables:
    
    206
    +    osname: "darwin"
    
    207
    +    CURL: "/opt/local/bin/curl"
    
    209 208
     
    
    210 209
     osx:build:
    
    211 210
       <<: *build_configuration
    
    ... ... @@ -280,6 +279,7 @@ opensuse:install:
    280 279
         - opensuse
    
    281 280
       variables:
    
    282 281
         osname: "linux"
    
    282
    +    CURL: "curl"
    
    283 283
     
    
    284 284
     opensuse:build:
    
    285 285
       <<: *build_configuration