[Git][ghc/ghc][wip/marge_bot_batch_merge_job] gitlab-ci: Always push perf notes

Marge Bot gitlab at gitlab.haskell.org
Sat Jun 13 11:54:18 UTC 2020



 Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
8bba1c26 by Ben Gamari at 2020-06-13T04:59:06-04:00
gitlab-ci: Always push perf notes

Previously we ci.sh would run with `set -e` implying that we wouldn't
push perf notes if the testsuite were to fail, even if it *only* failed
due to perf notes. This rendered the whole performance testing story
quite fragile as a single regressing commit would cause every successive
commit to fail since a new baseline would not be uploaded.

Fix this by ensuring that we always push performance notes.

- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -441,9 +441,18 @@ case $1 in
   setup) setup && cleanup_submodules ;;
   configure) configure ;;
   build_make) build_make ;;
-  test_make) fetch_perf_notes; test_make; push_perf_notes ;;
+  test_make)
+    fetch_perf_notes
+    test_make || push_perf_notes
+    push_perf_notes ;;
   build_hadrian) build_hadrian ;;
-  test_hadrian) fetch_perf_notes; test_hadrian; push_perf_notes ;;
+  # N.B. Always push notes, even if the build fails. This is okay to do as the
+  # testsuite driver doesn't record notes for tests that fail due to
+  # correctness.
+  test_hadrian)
+    fetch_perf_notes
+    test_hadrian || push_perf_notes
+    push_perf_notes ;;
   run_hadrian) run_hadrian $@ ;;
   clean) clean ;;
   shell) shell $@ ;;



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8bba1c26193e704d2d6bb2be9a2fac668b0ea54c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8bba1c26193e704d2d6bb2be9a2fac668b0ea54c
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200613/3569fb9b/attachment.html>


More information about the ghc-commits mailing list