aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2020-03-31 20:30:03 +0200
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2020-03-31 20:30:03 +0200
commit787c5a53503e838d7f604d0a20b62de6988cd488 (patch)
tree8e2f1d92f44be0460b37837d28aafe287f07d9e4
parent189ba9051b23b8e5535115071fe4fdf43976b4c0 (diff)
parent6bfbd278803e14ddd8c74ae582e76607cca69591 (diff)
downloadcompcert-kvx-787c5a53503e838d7f604d0a20b62de6988cd488.tar.gz
compcert-kvx-787c5a53503e838d7f604d0a20b62de6988cd488.zip
Merge remote-tracking branch 'origin/mppa-work' into mppa-cse3
-rw-r--r--.gitlab-ci.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed3cb261..1f854fc3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,14 @@ check-admitted:
script:
- ./config_x86_64.sh
- make check-admitted
+ rules:
+ - if: '$CI_COMMIT_BRANCH == "mppa-work"'
+ when: always
+ - if: '$CI_COMMIT_BRANCH == "mppa-k1c"'
+ when: always
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ when: always
+ - when: manual
build_x86_64:
stage: build