Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -3,54 +3,143 @@ variables:
    3 3
       version: "2020-04-x86"
    
    4 4
       bootstrap: ""
    
    5 5
     
    
    6
    -linux-runner:
    
    7
    -  artifacts:
    
    8
    -    paths:
    
    9
    -      - ansi-test/test.out
    
    10
    -      - benchmarks/cl-bench/results
    
    6
    +stages:
    
    7
    +  - install
    
    8
    +  - build
    
    9
    +  - test
    
    10
    +  - benchmark
    
    11
    +
    
    12
    +cache:
    
    13
    +
    
    14
    +
    
    15
    +linux:install:
    
    16
    +  stage: install
    
    11 17
       tags:
    
    12 18
         - linux
    
    13
    -  before_script:
    
    14
    -    - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git
    
    15
    -    - (cd ansi-test; git checkout rtoy-cmucl-expected-failures)
    
    19
    +  artifacts:
    
    20
    +    paths:
    
    21
    +      - snapshot/
    
    22
    +  script:
    
    16 23
         - wget -nv $download_url/cmucl-$version-linux.tar.bz2
    
    17 24
         - wget -nv $download_url/cmucl-$version-linux.extra.tar.bz2
    
    18 25
         - mkdir snapshot
    
    19 26
         - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2)
    
    27
    +
    
    28
    +linux:build:
    
    29
    +  stage: build
    
    30
    +  tags:
    
    31
    +    - linux
    
    32
    +  artifacts:
    
    33
    +    paths:
    
    34
    +      - dist/
    
    35
    +  needs:
    
    36
    +    - job: linux:install
    
    37
    +      artifacts: true
    
    20 38
       script:
    
    21 39
         - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp
    
    22 40
         - bin/make-dist.sh -I dist linux-4
    
    41
    +
    
    42
    +linux:test:
    
    43
    +  stage: test
    
    44
    +  tags:
    
    45
    +    - linux
    
    46
    +  artifacts:
    
    47
    +    paths:
    
    48
    +      - ansi-test/test.out
    
    49
    +      - test.log
    
    50
    +  needs:
    
    51
    +    # Needs artifacts from build (dist/)
    
    52
    +    - job: linux:build
    
    53
    +      artifacts: true
    
    54
    +  before_script:
    
    55
    +    - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git
    
    56
    +    - (cd ansi-test; git checkout rtoy-cmucl-expected-failures)
    
    57
    +  script:
    
    23 58
         - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
    
    24 59
         - cd ansi-test
    
    25 60
         - make LISP="../dist/bin/lisp -batch -noinit -nositeinit"
    
    26 61
         - grep 'No unexpected \(successes\|failures\)' test.out
    
    27
    -    - cd ../benchmarks/cl-bench
    
    62
    +
    
    63
    +linux:benchmark:
    
    64
    +  stage: benchmark
    
    65
    +  tags:
    
    66
    +    - linux
    
    67
    +  artifacts:
    
    68
    +    paths:
    
    69
    +      - benchmarks/cl-bench/results
    
    70
    +  needs:
    
    71
    +    # Needs artifacts from install (snapshot/) and build (dist/)
    
    72
    +    - job: linux:install
    
    73
    +      artifacts: true
    
    74
    +    - job: linux:build
    
    75
    +  script:
    
    76
    +    - cd benchmarks/cl-bench
    
    28 77
         - mkdir tmp
    
    29 78
         - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh
    
    30 79
         - CMUCL=../../dist/bin/lisp ./run-cmucl.sh
    
    31 80
         - ../../snapshot/bin/lisp -load report
    
    32 81
     
    
    33
    -osx-runner:
    
    34
    -  artifacts:
    
    35
    -    paths:
    
    36
    -      - ansi-test/test.out
    
    37
    -      - benchmarks/cl-bench/results
    
    82
    +osx:install:
    
    83
    +  stage: install
    
    38 84
       tags:
    
    39 85
         - osx
    
    40
    -  before_script:
    
    41
    -    - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git
    
    42
    -    - (cd ansi-test; git checkout rtoy-cmucl-expected-failures)
    
    86
    +  artifacts:
    
    87
    +    paths:
    
    88
    +      - snapshot/
    
    89
    +  script:
    
    43 90
         - curl -s -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2
    
    44 91
         - mkdir snapshot
    
    45 92
         - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2)
    
    93
    +
    
    94
    +osx:build:
    
    95
    +  stage: build
    
    96
    +  tags:
    
    97
    +    - osx
    
    98
    +  artifacts:
    
    99
    +    paths:
    
    100
    +      - dist/
    
    101
    +  needs:
    
    102
    +    - job: osx:install
    
    103
    +      artifacts: true
    
    46 104
       script:
    
    47 105
         - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp
    
    48 106
         - bin/make-dist.sh -I dist darwin-4
    
    107
    +
    
    108
    +osx:test:
    
    109
    +  stage: test
    
    110
    +  tags:
    
    111
    +    - osx
    
    112
    +  artifacts:
    
    113
    +    paths:
    
    114
    +      - ansi-test/test.out
    
    115
    +      - test.log
    
    116
    +  needs:
    
    117
    +    # Needs artifacts from build (dist/)
    
    118
    +    - job: osx:build
    
    119
    +      artifacts: true
    
    120
    +  before_script:
    
    121
    +    - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git
    
    122
    +    - (cd ansi-test; git checkout rtoy-cmucl-expected-failures)
    
    123
    +  script:
    
    49 124
         - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
    
    50 125
         - cd ansi-test
    
    51 126
         - make LISP="../dist/bin/lisp -batch -noinit -nositeinit"
    
    52 127
         - grep 'No unexpected \(successes\|failures\)' test.out 
    
    53
    -    - cd ../benchmarks/cl-bench
    
    128
    +
    
    129
    +osx:benchmark:
    
    130
    +  stage: benchmark
    
    131
    +  tags:
    
    132
    +    - osx
    
    133
    +  artifacts:
    
    134
    +    paths:
    
    135
    +      - benchmarks/cl-bench/results
    
    136
    +  needs:
    
    137
    +    # Needs artifacts from install (snapshot/) and build (dist/)
    
    138
    +    - job: osx:install
    
    139
    +      artifacts: true
    
    140
    +    - job:  osx:build
    
    141
    +  script:
    
    142
    +    - cd benchmarks/cl-bench
    
    54 143
         - mkdir tmp
    
    55 144
         - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh
    
    56 145
         - CMUCL=../../dist/bin/lisp ./run-cmucl.sh