diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-10-12 12:27:06 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-20 14:06:36 -0400 |
| commit | 3e4b51ff65f32722c0f35e34731e7001bc06e547 (patch) | |
| tree | d46ea81deeb802202d30d1e6a2cf75f458d8466f | |
| parent | 5f274fbfd4188dda2e7d74d374f2105db22c5610 (diff) | |
| download | haskell-3e4b51ff65f32722c0f35e34731e7001bc06e547.tar.gz | |
Fix perf-nofib CI job
The main change is to install the necessary build dependencies into an
environment file using `caball install --lib`.
Also updates the nofib submodule with a few fixes needed for the job to
work.
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| m--------- | nofib | 0 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cea65283a8..44bae2c960 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1325,7 +1325,6 @@ nightly-hackage: perf-nofib: # This needs to be reverted, and is only # an attempt to unbreak master - allow_failure: true stage: testing needs: [validate-x86_64-linux-deb9-dwarf, doc-tarball] dependencies: @@ -1338,27 +1337,28 @@ perf-nofib: tags: - x86_64-linux before_script: - - "cabal update --index=$HACKAGE_INDEX_STATE" + - cd nofib + - "cabal update --index=$HACKAGE_INDEX_STATE --project-file=cabal.project.head-hackage" script: - root=$(pwd)/ghc - | mkdir tmp - tar -xf ghc-x86_64-deb9-linux-dwarf.tar.xz -C tmp + tar -xf ../ghc-x86_64-deb9-linux-dwarf.tar.xz -C tmp pushd tmp/ghc-*/ ./configure --prefix=$root make install popd rm -Rf tmp - - export BOOT_HC=$GHC - - cabal install -w "$BOOT_HC" --lib regex-compat - export PATH=$root/bin:$PATH - - make -C nofib boot mode=fast -j$CPUS - - "make -C nofib EXTRA_RUNTEST_OPTS='-cachegrind +RTS -V0 -RTS' NoFibRuns=1 mode=fast -j$CPUS 2>&1 | tee nofib.log" + - cabal install -w "$root/bin/ghc" --lib regex-compat unboxed-ref parallel random-1.2.1 --allow-newer --package-env local.env --project-file=cabal.project.head-hackage + - export GHC_ENVIRONMENT="$(pwd)/local.env" + - "make HC=$root/bin/ghc BOOT_HC=$root/bin/ghc boot mode=fast -j$CPUS" + - "make HC=$root/bin/ghc BOOT_HC=$root/bin/ghc EXTRA_RUNTEST_OPTS='-cachegrind +RTS -V0 -RTS' NoFibRuns=1 mode=fast -j$CPUS 2>&1 | tee nofib.log" artifacts: expire_in: 12 week when: always paths: - - nofib.log + - nofib/nofib.log rules: - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/' diff --git a/nofib b/nofib -Subproject d183b1f0259d50aafa27d17850c73caa3d887d6 +Subproject 24a179b18d4aeb2675d22d33a435baeb70183c9 |