From f939375d5074fc9af004a4c3a3f51a7cb2b26caf Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Fri, 27 Mar 2020 19:29:34 +0100 Subject: more config --- .gitlab-ci.yml | 25 +++++++++++++++++++++++-- config_ppc64.sh | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 config_ppc64.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6aca7a8c..e67a7508 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,14 +92,35 @@ build_ppc: image: "coqorg/coq" before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install gcc-multilib-powerpc-linux-gnu qemu-user + - sudo apt-get -y install gcc-powerpc-linux-gnu qemu-user - opam switch 4.07.1+flambda - eval `opam config env` - opam install -y menhir script: - ./config_ppc.sh - make -j "$NJOBS" - - cd test && make CCOMPOPTS=-static SIMU='qemu-ppc' EXECUTE='qemu-ppc' all test + 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_ppc64: + stage: build + image: "coqorg/coq" + 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 qemu-user + - opam switch 4.07.1+flambda + - eval `opam config env` + - opam install -y menhir + script: + - ./config_ppc64.sh + - make -j "$NJOBS" + - cd test && make CCOMPOPTS=-static SIMU='qemu-ppc64' EXECUTE='qemu-ppc64' all test rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always diff --git a/config_ppc64.sh b/config_ppc64.sh new file mode 100644 index 00000000..df31c18f --- /dev/null +++ b/config_ppc64.sh @@ -0,0 +1 @@ +exec ./config_simple.sh ppc64-linux --toolprefix powerpc64-linux-gnu- "$@" -- cgit