diff options
| author | Maxime Dénès | 2017-06-12 15:41:20 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-06-12 16:43:32 +0200 |
| commit | ba079418c3ffbfa0d852a8bc73fd9d258e6da4ef (patch) | |
| tree | a63209cfbec52b4ba6a014702470bb19d06a82af /dev | |
| parent | 102d7418e399de646b069924277e4baea1badaca (diff) | |
| parent | 8443867a2f944c3ecaf0b0b826368c29935a21e1 (diff) | |
Merge PR#707: add support for "-bypass-API" argument to "coq_makefile"
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/ci/ci-fiat-parsers.sh | 2 | ||||
| -rw-r--r-- | dev/ci/ci-user-overlay.sh | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/dev/ci/ci-fiat-parsers.sh b/dev/ci/ci-fiat-parsers.sh index a0cb008a32..2095245eb8 100755 --- a/dev/ci/ci-fiat-parsers.sh +++ b/dev/ci/ci-fiat-parsers.sh @@ -7,4 +7,4 @@ fiat_parsers_CI_DIR=${CI_BUILD_DIR}/fiat git_checkout ${fiat_parsers_CI_BRANCH} ${fiat_parsers_CI_GITURL} ${fiat_parsers_CI_DIR} -( cd ${fiat_parsers_CI_DIR} && make -j ${NJOBS} parsers && make -j ${NJOBS} fiat-core ) +( cd ${fiat_parsers_CI_DIR} && make -j ${NJOBS} parsers parsers-examples && make -j ${NJOBS} fiat-core ) diff --git a/dev/ci/ci-user-overlay.sh b/dev/ci/ci-user-overlay.sh index 195ede6d00..0edaf07efc 100644 --- a/dev/ci/ci-user-overlay.sh +++ b/dev/ci/ci-user-overlay.sh @@ -30,3 +30,13 @@ if [ $TRAVIS_PULL_REQUEST == "669" ] || [ $TRAVIS_BRANCH == "ssr-merge" ]; then mathcomp_CI_GITURL=https://github.com/maximedenes/math-comp.git fi +echo "DEBUG: ci-user-overlay.sh 0" +if [ $TRAVIS_PULL_REQUEST = "707" ] || [ $TRAVIS_BRANCH == "trunk__API__coq_makefile" ]; then + echo "DEBUG: ci-user-overlay.sh 1" + bedrock_src_CI_BRANCH=trunk__API + bedrock_src_CI_GITURL=https://github.com/matejkosik/bedrock.git + bedrock_facade_CI_BRANCH=trunk__API + bedrock_facade_CI_GITURL=https://github.com/matejkosik/bedrock.git + fiat_parsers_CI_BRANCH=trunk__API + fiat_parsers_CI_GITURL=https://github.com/matejkosik/fiat.git +fi |