From 2bf707f9fe5259f869999347a46ec52ab096e030 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 8 Jun 2021 01:06:09 +0200 Subject: run CI on kvx-work-ssa kvx-work-velus --- .gitlab-ci.yml | 106 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 49 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7811ae3..9f407912 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ check-admitted: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always @@ -35,7 +35,7 @@ build_x86_64: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always @@ -58,7 +58,7 @@ build_ia32: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always @@ -83,7 +83,7 @@ build_aarch64: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always @@ -108,7 +108,9 @@ build_arm: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always @@ -134,53 +136,55 @@ build_armhf: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' - when: always - - if: '$CI_COMMIT_BRANCH == "master"' - when: always - - when: manual - -build_ppc: - stage: build - image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda - before_script: - - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install gcc-powerpc-linux-gnu qemu-user - - eval `opam config env` - - opam update - - opam install -y menhir - script: - - ./config_ppc.sh - - make -j "$NJOBS" - rules: - - if: '$CI_COMMIT_BRANCH == "kvx-work"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always - when: manual -build_ppc64: - stage: build - image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda - before_script: - - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install gcc-powerpc64-linux-gnu - - eval `opam config env` - - opam update - - opam install -y menhir - script: - - ./config_ppc64.sh - - make -j "$NJOBS" - rules: - - if: '$CI_COMMIT_BRANCH == "kvx-work"' - when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' - when: always - - if: '$CI_COMMIT_BRANCH == "master"' - when: always - - when: manual +# build_ppc: +# stage: build +# image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda +# before_script: +# - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update +# - sudo apt-get -y install gcc-powerpc-linux-gnu qemu-user +# - eval `opam config env` +# - opam update +# - opam install -y menhir +# script: +# - ./config_ppc.sh +# - make -j "$NJOBS" +# rules: +# - if: '$CI_COMMIT_BRANCH == "kvx-work"' +# when: always +# - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' +# when: always +# - if: '$CI_COMMIT_BRANCH == "master"' +# when: always +# - when: manual + +# build_ppc64: +# stage: build +# image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda +# before_script: +# - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update +# - sudo apt-get -y install gcc-powerpc64-linux-gnu +# - eval `opam config env` +# - opam update +# - opam install -y menhir +# script: +# - ./config_ppc64.sh +# - make -j "$NJOBS" +# rules: +# - if: '$CI_COMMIT_BRANCH == "kvx-work"' +# when: always +# - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' +# when: always +# - if: '$CI_COMMIT_BRANCH == "master"' +# when: always +# - when: manual build_rv64: stage: build @@ -201,7 +205,7 @@ build_rv64: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always @@ -222,7 +226,9 @@ build_rv32: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always @@ -249,7 +255,9 @@ build_kvx: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always - - if: '$CI_COMMIT_BRANCH == "mppa-kvx"' + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' when: always -- cgit