From 2c56ce62c6bfd59aabccbb0df47b8247375556b4 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Fri, 11 Jun 2021 13:28:12 +0200 Subject: add PPC to CI and remove ugly hack for qemu linker paths --- .gitlab-ci.yml | 118 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 56 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f407912..9eac61a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,8 @@ check-admitted: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' @@ -35,6 +37,8 @@ build_x86_64: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' @@ -58,6 +62,8 @@ build_ia32: rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' @@ -76,13 +82,13 @@ build_aarch64: script: - ./config_aarch64.sh - make -j "$NJOBS" - - export LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib - - sudo ln -s /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib - - make -C test CCOMPOPTS='-static' SIMU='qemu-aarch64' EXECUTE='qemu-aarch64' all test - - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='aarch64-linux-gnu-gcc' EXECUTE='qemu-aarch64' CCOMPOPTS='-static' TARGET_CFLAGS='-static' + - make -C test CCOMPOPTS='-static' SIMU='qemu-aarch64' EXECUTE='qemu-aarch64 -L /usr/aarch64-linux-gnu/lib' all test + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='aarch64-linux-gnu-gcc' EXECUTE='qemu-aarch64 -L /usr/aarch64-linux-gnu/lib' CCOMPOPTS='-static' TARGET_CFLAGS='-static' rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' @@ -101,10 +107,8 @@ build_arm: script: - ./config_arm.sh - make -j "$NJOBS" - - export LD_LIBRARY_PATH=/usr/arm-linux-gnueabi/lib - - sudo ln -s /usr/arm-linux-gnueabi/lib/ld-linux.so.3 /lib # FIXME: UGLY ! - - make -C test CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm' all test - - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='arm-linux-gnueabi-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 + - make -C test CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm -L /usr/arm-linux-gnueabi' all test + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='arm-linux-gnueabi-gcc' EXECUTE='qemu-arm -L /usr/arm-linux-gnueabi' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always @@ -129,10 +133,8 @@ build_armhf: script: - ./config_armhf.sh - make -j "$NJOBS" - - export LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib - - sudo ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib # FIXME: UGLY ! - - make -C test CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm' all test - - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 + - make -C test CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm -L /usr/arm-linux-gnueabihf' all test + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm -L /usr/arm-linux-gnueabihf' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always @@ -144,47 +146,51 @@ build_armhf: 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_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" + - make -C test CCOMPOPTS=-static SIMU='qemu-ppc' EXECUTE='qemu-ppc -L /usr/powerpc-linux-gnu -cpu 7400' all test + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='powerpc-linux-gnu-gcc' EXECUTE='qemu-ppc -L /usr/powerpc-linux-gnu -cpu 7400' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 + 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_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" + - make -C test CCOMPOPTS=-static SIMU='qemu-ppc64' EXECUTE='qemu-ppc64 -L /usr/powerpc64-linux-gnu -cpu 7400' all test + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='powerpc64-linux-gnu-gcc' EXECUTE='qemu-ppc -L /usr/powerpc64-linux-gnu -cpu 7400' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 + 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 @@ -198,13 +204,13 @@ build_rv64: script: - ./config_rv64.sh - make -j "$NJOBS" - - export LD_LIBRARY_PATH=/usr/riscv64-linux-gnu/lib - - sudo ln -s /usr/riscv64-linux-gnu/lib/ld-linux-riscv64-lp64d.so.1 /lib - - make -C test CCOMPOPTS=-static SIMU='qemu-riscv64' EXECUTE='qemu-riscv64' all test - - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='riscv64-linux-gnu-gcc' EXECUTE='qemu-riscv64' CCOMPOPTS='-static' TARGET_CFLAGS='-static' + - make -C test CCOMPOPTS=-static SIMU='qemu-riscv64' EXECUTE='qemu-riscv64 -L /usr/riscv64-linux-gnu' all test + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='riscv64-linux-gnu-gcc' EXECUTE='qemu-riscv64 -L /usr/riscv64-linux-gnu' CCOMPOPTS='-static' TARGET_CFLAGS='-static' rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always + - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"' + when: always - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"' when: always - if: '$CI_COMMIT_BRANCH == "master"' -- cgit