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

Commits:

1 changed file:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -13,16 +13,23 @@ variables:
    13 13
         - echo PATH = $PATH
    
    14 14
         - ls -F /usr/local/bin
    
    15 15
         - type -all gitlab-runner
    
    16
    +    # Download binaries.  (Do we really need the extras tarball?)
    
    16 17
         - $CURL -o cmucl-$version-$osname.tar.bz2 $download_url/cmucl-$version-$osname.tar.bz2
    
    17 18
         - $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
    
    20 19
         - mkdir snapshot
    
    21 20
         - (cd snapshot; tar xjf ../cmucl-$version-$osname.tar.bz2; tar xjf ../cmucl-$version-$osname.extra.tar.bz2)
    
    22 21
     
    
    23
    -# Rule to build cmucl for all OSes, assuming we don't need anything
    
    24
    -# special and the option '-C ""' is good enough.
    
    25
    -.build_cmucl:
    
    22
    +# Default build configuration to be added to each build stage for each
    
    23
    +# OS.  This assumes we don't need anything special between OSes, and
    
    24
    +# the option '-C ""' is good enough.
    
    25
    +.build_template: &build_configuration
    
    26
    +  stage: build
    
    27
    +  artifacts:
    
    28
    +    paths:
    
    29
    +      - dist/
    
    30
    +      - build-2/*.log
    
    31
    +      - build-3/*.log
    
    32
    +      - build-4/
    
    26 33
       script:
    
    27 34
         # Do cross compile first
    
    28 35
         #- bin/create-target.sh xtarget x86_linux_clang
    
    ... ... @@ -36,18 +43,6 @@ variables:
    36 43
         # string, an alternative can be provided with the -V flag
    
    37 44
         - bin/make-dist.sh -I dist build-4
    
    38 45
     
    
    39
    -
    
    40
    -# Default build configuration to be added to each build stage for each
    
    41
    -# OS.
    
    42
    -.build_template: &build_configuration
    
    43
    -  stage: build
    
    44
    -  artifacts:
    
    45
    -    paths:
    
    46
    -      - dist/
    
    47
    -      - build-2/*.log
    
    48
    -      - build-3/*.log
    
    49
    -      - build-4/
    
    50
    -
    
    51 46
     # Default configuration for running the ansi-tests.
    
    52 47
     .ansi_test_template: &ansi_test_configuration
    
    53 48
       stage: ansi-test
    
    ... ... @@ -116,8 +111,6 @@ linux:build:
    116 111
       needs:
    
    117 112
         - job: linux:install
    
    118 113
           artifacts: true
    
    119
    -  script:
    
    120
    -    - !reference [.build_cmucl, script]
    
    121 114
     
    
    122 115
     linux:cross-build:
    
    123 116
       stage: build
    
    ... ... @@ -213,8 +206,6 @@ osx:build:
    213 206
       needs:
    
    214 207
         - job: osx:install
    
    215 208
           artifacts: true
    
    216
    -  script:
    
    217
    -    - !reference [.build_cmucl, script]
    
    218 209
     
    
    219 210
     osx:test:
    
    220 211
       <<: *unit_test_configuration
    
    ... ... @@ -270,8 +261,8 @@ linux:static-analyzer:
    270 261
         # the results to the log file instead of also having it go to the
    
    271 262
         # console.  If someday there's less or no output, we can consider
    
    272 263
         # having the logs go to the console too.
    
    273
    -    - make -C linux-4/lisp clean
    
    274
    -    - make -C linux-4/lisp CFLAGS=-fanalyzer > analyzer.log 2>&1 
    
    264
    +    - make -C build-4/lisp clean
    
    265
    +    - make -C build-4/lisp CFLAGS=-fanalyzer > analyzer.log 2>&1 
    
    275 266
     
    
    276 267
     opensuse:install:
    
    277 268
       <<: *install_configuration
    
    ... ... @@ -288,8 +279,6 @@ opensuse:build:
    288 279
       needs:
    
    289 280
         - job: opensuse:install
    
    290 281
           artifacts: true
    
    291
    -  script:
    
    292
    -    - !reference [.build_cmucl, script]
    
    293 282
     
    
    294 283
     opensuse:test:
    
    295 284
       <<: *unit_test_configuration