diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-31 20:30:13 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-31 20:30:13 +0200 |
| commit | 68b24787e03cf4482f1a672bf65292127316a194 (patch) | |
| tree | 9f1e7dc16b4dd82817f26cb0b57831349e000d30 | |
| parent | ed2e43e3513aa6950480015b255af69df4d86ab9 (diff) | |
| parent | 6bfbd278803e14ddd8c74ae582e76607cca69591 (diff) | |
| download | compcert-kvx-68b24787e03cf4482f1a672bf65292127316a194.tar.gz compcert-kvx-68b24787e03cf4482f1a672bf65292127316a194.zip | |
Merge remote-tracking branch 'origin/mppa-work' into mppa-licm
| -rw-r--r-- | .gitlab-ci.yml | 8 |
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 |